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

Conflicts:
	Resources/android/alloy/controllers/colourSwatches.js
	app/controllers/colourSwatches.js
	build/alloy/build.json
	build/android/assets/alloy/controllers/colourSwatches.js
	build/android/assets/alloy/controllers/storeLocatorByState.js