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

Conflicts:
	build/alloy/build.json
	build/android/assets/alloy.js
	build/android/assets/alloy/controllers/aboutUs.js
	build/android/assets/alloy/controllers/brochure.js
	build/android/assets/alloy/controllers/colourPicker.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/controllers/toggle.js
	build/android/assets/alloy/models/Brochure.js
	build/android/assets/alloy/models/Category_colour.js
	build/android/assets/alloy/models/Category_type.js
	build/android/assets/alloy/sync/localStorage.js
	build/android/assets/api.js
	build/android/assets/pdf.js