make color picker more obviously be a large hit target; make a global for template serialization
Merge pull request #229 from davidascher/tweak

make color picker more obviously be a large hit target; and
Merge pull request #230 from mozilla/sublime-project

Sublime Text Project Files
Merge branch 'master' of github.com:mozilla/appmaker

Conflicts:
	public/javascripts/designer.js