adding note about submodule and how to get it setup
Merge remote-tracking branch 'upstream/master'
Making the components tray expand with the phone editor and scroll when necessary.
Merge branch 'master' of https://github.com/mozilla/appmaker

Conflicts:
	public/vendor/ceci
add boolean fields on components in designer
clean up landing page still crappy
button css cleanup
enter app name on home
Adding callback functions for async components; fixing some case issues.
Merge branch 'master' of github.com:mozilla/appmaker
Merge pull request #128 from lpachols/master

Making the components tray expand with the phone editor and scroll when necessary.
Merge pull request #130 from davidascher/master

boolean fields, and a note for README.
Adding async + require component stuff
Updating for cards.js
# This is a combination of 2 commits.
# The first commit's message is:

rebase

# This is the 2nd commit message:

forgot these files
rebase