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:
	main.go
	templates/advice.html
	templates/album_settings.html
	templates/blog.html
	templates/edit_profile.html
	templates/feed.html
	templates/follower.html
	templates/home_user.html
	templates/lists_album.html
	templates/lists_blogs.html
	templates/search.html
	templates/search_empty.html
	templates/user.html
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'