Added play/pause buttons to album view
Updating generated content
Updating generated again
Dealing with generated content issues
Merge branch 'album-play-pause'

Conflicts:
	public/javascripts/app.js
	public/javascripts/app.js.map