Before regalis
Merge https://github.com/Regalis/Jamii into develop
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop
submit and reset
Merge branch 'develop' of github.com:matteozajac/Jamii into develop

Conflicts:
	src/srv/http/page2.html
Attached the logout function to button.
Restore clientHandlers.js version
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop

Conflicts:
	src/srv/http/js/rest.js
Add password change notifications
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Board customisation and popups
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
conference invitations
Merge branch 'develop' of github.com:alekgajos/Jamii into develop
whiteboard colors
Merge branch 'develop' of https://github.com/alekgajos/Jamii into develop
logout and conf
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Fix in account change GUI