Changed input to button in index.html
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
Merge branch 'develop' of github.com:matteozajac/Jamii into develop
First stage of options
Options
Merge branch 'develop' of https://github.com/Regalis/Jamii into develop
Changed apperance of chat and friend list
Server change
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into develop
Add friend changes (form + button)
Merge branch 'develop' of https://github.com/ArianaLas/Jamii into friendSearchMerge. Hurra.

Conflicts:
	src/srv/http/js/friendListGUI.js