add search form in page html with validation
Merge branch 'develop' of https://github.com/alekgajos/Jamii into gui
Merge branch 'develop' of https://github.com/Regalis/Jamii into gui
my page html + searchForm
Merge branch 'gui' of https://github.com/Folwarski/Jamii into friendSearchMerge
Removed the add_friend button (moved to html).
Add friend changes (form + button)
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into friendSearchMerge. Hurra.

Conflicts:
	src/srv/http/js/friendListGUI.js
Merge branch 'friendSearchMerge' into develop