Added featured rooms
Don't show occupantof rooms in featured, animate cards
Merge branch 'master' into recommend
Merge branch 'master' into recommend
Merge branch 'master' into recommend
Merge branch 'master' into recommend
Don't use infinite scroll for rooms
Merge branch 'master' into recommend

Conflicts:
	socket/socket-client.js
	ui/room-card.js
	ui/room-list.js
Add featured rooms to home feed (proper styling needed)
Merge branch master
Don't move current room to top when clicking on room-area
Add colors to room cards
Added test cases for embed page
Merge branch 'master' into recommend

Conflicts:
	anti-abuse/anti-abuse-client.js
	entityloader/entityloader.js
	http/page.js
	public/client.hbs
	public/cordova.js
	public/cordova_plugins.js
	public/s/styles/scss/client.scss
	test/selenium/room-settings-test.js
Merge branch 'master' into recommend

Conflicts:
	client.js
	entityloader/entityloader.js
	public/cordova_plugins.js
	test/selenium/room-settings-test.js
	ui/home-feed.js
	ui/room-list.js
Added notypeof true which was removed during merge
Merge pull request #342 from scrollback/smallfixes

CTA fixes
sending back messages.
Remove room items one by one to leave
Disable leave until the functionality is complete