TABS MUST DIE
Merge branch 'master' of github.com:mozilla/appmaker

Conflicts:
	public/stylesheets/style.css