11/11/2014
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	build/alloy/build.json