Added color picker stuff
Merge branch 'master' of https://github.com/sschwebach/Enlights into sam

Conflicts:
	.idea/workspace.xml