minor change on colour Swatches
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	app/views/colourDetails.xml
	build/alloy/build.json