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
Server change
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop