build update
Merge branch 'master' of https://github.com/LarsWerkman/HoloColorPicker

Conflicts:
	.gitignore