Merge branch 'develop' of https://github.com/alekgajos/Jamii into develop
Before alek
alek merge
files client
Merge branch 'develop' of github.com:matteozajac/Jamii into develop

Conflicts:
	src/srv/http/index.xhtml
	src/srv/http/js/initFunctions.js