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

Conflicts:
	build/alloy/build.json
	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/sync/properties.js
	build/android/assets/alloy/sync/sql.js

build/android/assets/alloy/widgets/nl.fokkezb.drawer/controllers/widget.
js
	build/android/assets/xhr.js
	build/android/assets/xp.ui.js