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

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

Conflicts:
	src/srv/http/js/rest.js
conference invitations