dnicommig
Merge branch 'master' of https://github.com/dni/publish-

Conflicts:
	components/backend/modules/settings/view/SettingsDetailView.coffee
ayay