24/10/2014

Updated:
Colour Swatches Filter function
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/colourSwatches.js
	Resources/android/alloy/controllers/diyPaint.js
	Resources/android/alloy/controllers/home.js
	Resources/android/alloy/controllers/index.js
	Resources/android/alloy/controllers/main.js
	Resources/android/alloy/controllers/menu.js
	Resources/android/alloy/controllers/storeLocator.js
	Resources/android/alloy/controllers/storeLocatorByState.js
	app/alloy.js
	app/controllers/diyPaint.js
	build/alloy/build.json
	build/android/assets/alloy/controllers/diyPaint.js
	build/map/Resources/android/app.js.map