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
Merge branch 'sync' of https://github.com/Folwarski/Jamii into mfsync

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