Merge branch 'develop' of https://github.com/Regalis/Jamii into gui

Conflicts:
	src/srv/http/js/friendListGUI.js
Merge branch 'develop' of https://github.com/Folwarski/Jamii into sync

Conflicts:
	src/srv/http/js/friendListGUI.js
fixed adding friends and new function to remove them
All HTML files are now served as application/xhtml+xml

* update index.xhtml
* page2.html is now broken
Merge branch 'sync' of https://github.com/Folwarski/Jamii into mfsync

Conflicts:
	src/clientHandlers.js
	src/server.js
	src/srv/http/js/friendListGUI.js
Update login/register view

* fix formatting in style.css
* removed unnecessary tags from index.html
Make page2.html work as application/xhtml+xml
removed alert