6/11/2014 Loading screen
default img
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	app/assets/html/canvas-paint-bucket.html
	build/android/assets/alloy/controllers/colourPicker.js
	build/android/assets/alloy/controllers/diyPaint.js
	build/android/assets/alloy/controllers/main.js
	build/android/assets/alloy/controllers/storeLocator.js
	build/android/assets/alloy/controllers/storeLocatorByState.js
	build/android/assets/alloy/models/Category_type.js
	build/android/assets/alloy/models/Colour.js
	build/android/assets/alloy/sync/properties.js
	build/android/assets/alloy/underscore.js
	build/map/Resources/android/alloy/controllers/index.js.map