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

Conflicts:
	templates/album_empty.html
Merge branch 'master' of https://github.com/fort-pinnsvin/travel

Conflicts:
	main.go
	models/collections.go
	models/models.go
Merge branch 'master' of https://github.com/fort-pinnsvin/travel

Conflicts:
	main.go
	models/collections.go
	models/models.go
Merge branch 'master' of https://github.com/fort-pinnsvin/travel
Merge branch 'master' of https://github.com/fort-pinnsvin/travel

Conflicts:
	main.go
	models/collections.go
	models/models.go