...
Merge branch 'master' of github.com:virtuecenter/manager

Conflicts:
	src/Manager/public/partials/collections/blogs.hbs
	src/Manager/public/partials/collections/photo_galleries.hbs
	src/Manager/public/partials/collections/videos.hbs