sync arrr
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/alloy/build.json
	build/android/assets/alloy.js
	build/android/assets/alloy/CFG.js
	build/android/assets/alloy/backbone.js
	build/android/assets/alloy/constants.js
	build/android/assets/alloy/controllers/BaseController.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/home.js
	build/android/assets/alloy/controllers/main.js
	build/android/assets/alloy/controllers/storeLocator.js
	build/android/assets/alloy/controllers/toggle.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/StoreLocator.js
	build/android/assets/alloy/styles/aboutUs.js
	build/android/assets/alloy/styles/brochure.js
	build/android/assets/alloy/styles/colourPicker.js
	build/android/assets/alloy/styles/colourSwatches.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/styles/toggle.js
	build/android/assets/alloy/sync/localStorage.js
	build/android/assets/alloy/sync/sql.js
	build/android/assets/alloy/underscore.js
	build/android/assets/alloy/widget.js

build/android/assets/alloy/widgets/nl.fokkezb.drawer/controllers/widget.
js
	build/android/assets/alloy/widgets/nl.fokkezb.drawer/styles/widget.js
	build/android/assets/api.js
	build/android/assets/app.js
	build/android/assets/common.js
	build/android/assets/pdf.js
	build/android/assets/xhr.js
	build/android/assets/xp.ui.js
	tiapp.xml
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/android/assets/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/storeLocator.js
	build/android/assets/alloy/controllers/storeLocatorByState.js
	build/android/assets/alloy/models/Colour.js