category commit
ignore
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/map/Resources/android/alloy/controllers/colourSwatches.js.map
	build/map/Resources/android/alloy/controllers/index.js.map
ignore
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/styles/diyPaint.js
	Resources/android/alloy/styles/home.js
	Resources/android/alloy/styles/index.js
	Resources/android/alloy/styles/main.js
	Resources/android/alloy/styles/menu.js
	Resources/android/alloy/styles/storeLocator.js
	Resources/android/alloy/styles/storeLocatorByState.js
	Resources/iphone/alloy/controllers/colourSwatches.js
	Resources/iphone/alloy/controllers/home.js
	Resources/iphone/alloy/controllers/storeLocatorByState.js
	Resources/iphone/alloy/controllers/toggle.js
	Resources/iphone/alloy/styles/home.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/alloy/styles/main.js
	Resources/iphone/alloy/styles/menu.js
	Resources/iphone/alloy/styles/storeLocator.js
	Resources/iphone/alloy/styles/storeLocatorByState.js
	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/colourSwatches.js
	build/android/assets/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/home.js
	build/android/assets/alloy/controllers/index.js
	build/android/assets/alloy/controllers/main.js
	build/android/assets/alloy/controllers/menu.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/StoreLocator.js
	build/android/assets/alloy/styles/brochure.js
	build/android/assets/alloy/styles/colourPicker.js
	build/android/assets/alloy/styles/diyPaint.js
	build/android/assets/alloy/styles/home.js
	build/android/assets/alloy/styles/index.js
	build/android/assets/alloy/styles/main.js
	build/android/assets/alloy/styles/menu.js
	build/android/assets/alloy/styles/storeLocator.js
	build/android/assets/alloy/styles/storeLocatorByState.js
	build/android/assets/alloy/sync/localStorage.js
	build/android/assets/alloy/sync/properties.js
	build/android/assets/alloy/sync/sql.js
	build/android/assets/alloy/underscore.js
	build/map/Resources/android/alloy/controllers/aboutUs.js.map
	build/map/Resources/android/alloy/controllers/brochure.js.map
	build/map/Resources/android/alloy/controllers/colourPicker.js.map
	build/map/Resources/android/alloy/controllers/colourSwatches.js.map
	build/map/Resources/android/alloy/controllers/diyPaint.js.map
	build/map/Resources/android/alloy/controllers/home.js.map
	build/map/Resources/android/alloy/controllers/index.js.map
	build/map/Resources/android/alloy/controllers/storeLocator.js.map

build/map/Resources/android/alloy/controllers/storeLocatorByState.js.map