Re-bundling
Merge branch 'develop' of github.com:mozilla-appmaker/appmaker into develop