add search form in page html with validation
Merge branch 'develop' of https://github.com/alekgajos/Jamii into gui
Update formatting in server.js
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
Merge branch 'develop' of github.com:ArianaLas/Jamii into develop
Removed the add_friend button (moved to html).
my test
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into friendSearchMerge. Hurra.

Conflicts:
	src/srv/http/js/friendListGUI.js
Merge branch 'friendSearchMerge' into develop
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
All
working version
Pass change - client side, friendList - fixed images
First part of refactoring client
Refactor 2
alpha board
beta board
Options style changes