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 remote-tracking branch 'origin/master'

Conflicts:
	handlers/miniblog_handler.go
	main.go
	templates/album_empty.html
	templates/blog.html
	templates/lists_blogs.html
	templates/weather.html
Merge branch 'master' of https://github.com/fort-pinnsvin/travel

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