3/11/2014
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/colourPicker.js
	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/controllers/colourPicker.js
	app/views/colourPicker.xml
	build/alloy/build.json