begin new campaign form
Merge branch 'master' of github.com:summerspirit/hotbutton

Conflicts:
	db/schema.rb