Colour Picker: color library
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/android/assets/alloy/controllers/colourPicker.js
	build/android/assets/alloy/controllers/colourSwatches.js
	build/android/assets/alloy/underscore.js