:
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Registration succeed confirmation done
almost working adding friend
Merge branch 'develop' of github.com:alekgajos/Jamii into develop
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Fix in account change GUI
Search friend improved
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Merge branch 'develop' of github.com:ArianaLas/Jamii into develop
Fix a bug in confrerence invitation response in initFunctions.js
Fix a bug in adding users to confereneces on server.
almost working adding friend
Merge branch 'AG' of https://github.com/Folwarski/Jamii into mergeMF

Conflicts:
	src/clientHandlers.js
	src/srv/http/css/style-app.css
	src/srv/http/js/friendListGUI.js
	src/srv/http/js/initFunctions.js
	src/srv/http/js/rest.js
	src/srv/http/js/searchGUI.js
	src/srv/http/page2.html
Merge branch 'mergeMF' of https://github.com/alekgajos/Jamii into develop
Before alpha