editing submissions is UP AND RUNNING
Merge branch 'friday'

Conflicts:
	app/views/campaigns/show.html.erb