21/10/2014

Update: Colour Swatches BottomBar
omitted conflicts
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/brochure.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
	Resources/android/alloy/styles/colourSwatches.js
	Resources/android/alloy/styles/diyPaint.js
	build/android/assets/alloy/controllers/aboutUs.js
	build/android/assets/alloy/models/Brochure.js
	build/android/assets/alloy/models/Category.js
	build/android/assets/alloy/models/Category_colour.js
	build/android/assets/alloy/models/Category_type.js
	build/android/assets/alloy/models/Colour.js
	build/android/assets/alloy/styles/colourSwatches.js

build/android/assets/alloy/widgets/nl.fokkezb.drawer/controllers/widget.
js
	build/map/Resources/android/alloy/controllers/aboutUs.js.map