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

Conflicts:
	Resources/android/alloy/controllers/index.js
	app/controllers/index.js
	build/map/Resources/android/alloy/controllers/index.js.map