Merge remote-tracking branch 'origin/release' into release_2

Conflicts:
	app/models/album.rb
	app/views/home/gallery.html.haml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css.scss