Moved follow button next to title
Merge developement into webby
Merge branch 'webby' into development

Conflicts:
	entityloader/entityloader.js
	facebook/facebook.js
	http/socket.js
	interface/interface-client.js
	public/client.html
	public/s/components/compose.js
	public/s/components/info-area.js
	public/s/components/navigation.js
	public/s/components/room-list.js
	public/s/components/settings-area.js
	public/s/components/thread-area.js
	public/s/components/user-menu.js
	socket/socket-client.js