Campaign Editor
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrumpetMVP/Content/Site.css
	TrumpetMVP/Views/Campaign/Editor.cshtml