Added player bar to album view
updating css before merge again?
Merge branch 'album-view-player-bar'

Conflicts:
	public/stylesheets/app.css.map