Merge branch 'pr/374' into notificationsMerge2
-rw-r--r-- 208 .gitignore
-rw-r--r-- 35179 LICENSE.txt
-rwxr-xr-x 1713 README.md
drwxr-xr-x - client
-rw-r--r-- 4635 config.example.js
-rwxr-xr-x 156 kiwi
-rwxr-xr-x 41 kiwi.bat
-rw-r--r-- 720 package.json
drwxr-xr-x - server
drwxr-xr-x - server_modules