Merge branch 'settings' into development
-rw-r--r-- 170 .gitignore
-rw-r--r-- 35179 LICENSE.txt
-rwxr-xr-x 1635 README.md
drwxr-xr-x - client
-rw-r--r-- 4636 config.example.js
-rwxr-xr-x 156 kiwi
-rwxr-xr-x 41 kiwi.bat
-rw-r--r-- 721 package.json
drwxr-xr-x - server
drwxr-xr-x - server_modules