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

Conflicts:
	app/controllers/colourSwatches.js
	build/alloy/build.json
	build/android/assets/alloy/controllers/colourSwatches.js
	build/android/assets/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/home.js
	build/android/assets/alloy/controllers/main.js
	build/android/assets/alloy/controllers/storeLocator.js
	build/android/assets/alloy/controllers/storeLocatorByState.js
	build/android/assets/alloy/models/Category.js
	build/android/assets/alloy/models/Colour.js
	build/android/assets/alloy/models/StoreLocator.js
	build/android/assets/alloy/underscore.js
	build/android/assets/api.js