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

Conflicts:
	src/Manager/public/partials/collections/file_uploads.hbs
	src/Manager/public/partials/collections/social_links.hbs
	src/Manager/public/partials/forms/file_uploads.hbs