Merge branch 'albumshow-bb'

Conflicts:
	app/assets/templates/albums/_comments.jst.ejs
	app/views/albums/show.json.rabl
Merge branch 'master' of github.com:trvrfrd/trvrgur

Conflicts:
	app/views/albums/show.json.rabl