staging
mostly seems to work, some validation is needed
Merge branch 'develop' of github.com:mozilla-appmaker/appmaker into component-load-check

Conflicts:
	public/designer/components/user-state.html
undo removing of log to avoid conflict with other PR
Merge pull request #812 from mozilla-appmaker/component-load-check

Sanity checking the URLs to components