UI refactoring
Merge branch 'master' of https://github.com/wolfwizard/AngularPhotoStorage

Conflicts:
	app/assets/partials/albums.html.haml