Scrubbing addform
Merge branch 'master' of github.com:mozilla-appmaker/appmaker into develop