5/11/2014 ColorPicker: watermark & disable scroll
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/android/assets/alloy/controllers/colourSwatches.js
	build/android/assets/alloy/models/Category.js
	build/android/assets/alloy/models/Colour.js
	build/android/assets/alloy/underscore.js