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
Added the google+ basic setup.
Merge branch 'master' into google-login
Got email from google.
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
Google+ login working for web.
Add featured rooms to home feed (proper styling needed)
Merge branch 'master' into google-login

Conflicts:
	facebook/facebook.js
	socket/socket-client.js
Adding google+ picture to the images list.
Closing the return window on google sign in.
Merge branch 'master' into google-login
Getting the google + login on phonegap.
Merge branch master
Don't move current room to top when clicking on room-area