add resource files for colorPicker
Merge branch 'master' of https://github.com/papayafiction/triangula-leveleditor

Conflicts:
	app/index.html