updating magento platform

updating magento platform to correctly build from composer and also
to perform cli installation

Conflicts:
	build/build.properties.tmp
corrected error with merge
Merge branch 'zucchi-up/mg'
Merge branch 'master' of github.com:martinglover/site-build

Conflicts:
	build/build.properties.tmp