Merge branch 'master' of https://github.com/fort-pinnsvin/travel

Conflicts:
	templates/album_empty.html
Merge remote-tracking branch 'origin/master'