Pull from Git
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/colourPicker.js
	Resources/android/alloy/controllers/diyPaint.js
	app/controllers/colourPicker.js
	app/controllers/diyPaint.js