DIY photo module
resources so
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy.js
	Resources/android/alloy/controllers/brochure.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/models/Brochure.js
	Resources/android/alloy/models/Category_colour.js
	Resources/android/alloy/models/Category_type.js
	Resources/android/alloy/models/StoreLocator.js
	Resources/android/alloy/sync/localStorage.js
	Resources/android/alloy/sync/properties.js
	Resources/android/alloy/sync/sql.js
	Resources/android/api.js
	Resources/android/pdf.js
	Resources/android/xhr.js
	app/controllers/diyPaint.js
	app/views/diyPaint.xml