colour swatches updates
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/android/assets/alloy/sync/properties.js
	build/android/assets/api.js