changes in edit page
Merge branch 'master' of heroku.com:marketing-update
error