templates list
Merge branch 'master' of github.com:shub1905/housing.radio

Conflicts:
	app/views/song_player/index.html.erb
 backbone, underscore