rebasing
rebase fixes
grunt
Enabling extending
Merge branch 'master' of github.com:mozilla/appmaker
Merge branch 'multichannel' of github.com:Pomax/appmaker into Pomax-multichannel
Switching to Ceci multichannel