diypaint
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/storeLocatorByState.js
	build/android/assets/alloy/models/Colour.js