Merge pull request #30 from jonjchew/desktop_landing_page

Desktop landing page
previous song now pauses
Merge pull request #31 from jonjchew/desktop_landing_page

( . Y . ) FAVICONZ ON FAVICONZ ON FAVICONZZZZZZzzz
Update Search behavior

* Increase search trigger time to 1200 miliseconds
* Hide/Show ajax-loader gif according to if the request is happening
Wrap Search input and ajax-loading gif into div#search-wrapper

* Set positioning in #search-wrapper instead of input
* Add ajax-loading image and style it
Merge branch 'master' into search_update

Conflicts:
	app/assets/stylesheets/desktop.css.erb
	app/assets/stylesheets/mobile.css.erb
	app/views/rooms/show.html.erb
Merge pull request #32 from jonjchew/search_update

Search update
optimized for tablet
merge with master
fix more css bugs, watermark