rebasing
rebase fixes
grunt
Enabling extending
Merge pull request #159 from lpachols/master

Putting a max-width on the data popup bubble.
Merge branch 'master' of github.com:mozilla/appmaker
Merge branch 'multichannel' of github.com:Pomax/appmaker into Pomax-multichannel
Switching to Ceci multichannel
[t108] builder! simple manifest templating
[t108] using moniker to generate random app names
[t108] routing fixes for app urls & manifest
Merge pull request #143 from secretrobotron/t108-builder

[t108] removed builder; simple manifest templating
test app sans designer
change inactive color
added tooltips for channels
semicolon
test app sans designer
Merge pull request #161 from Pomax/testapp2

test app sans designer
much better test app
Merge pull request #162 from mozilla/default-cleanup

Default cleanup
Updating ceci for pull/46
Merge pull request #164 from Pomax/testapp2

much better test app