aded package json and modified travis config
improved color picking dialog
Merge branch 'master' of https://github.com/stephde/customizeJS

Conflicts:
	.travis.yml
	package.json
Merge branch 'dev'