Merge branch 'mergeMF' of github.com:alekgajos/Jamii into develop
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Merge branch 'develop' of github.com:alekgajos/Jamii into develop
Remove hardcoded 'localhost' on client side
Merge branch 'develop' of github.com:matteozajac/Jamii into develop

Conflicts:
	src/srv/http/index.xhtml
	src/srv/http/js/initFunctions.js
files list gui