24/10/2014

Updated:
About Us - Message
Brochure categories function
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/styles/aboutUs.js
	app/controllers/colourSwatches.js
	app/views/colourSwatches.xml
	build/android/assets/alloy/controllers/brochure.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/sync/localStorage.js
	build/map/Resources/android/alloy/controllers/aboutUs.js.map