Changed input to button in index.html
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
First stage of options
Fix findUsersMultiKey in UsersDatabase
Merge branch 'develop' of github.com:alekgajos/Jamii into develop
Fix in getUserDataFromId response - add user id
Options
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
Changed apperance of chat and friend list
Server change
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop
Update formatting in server.js
Merge branch 'develop' of github.com:ArianaLas/Jamii into develop