updating magento platform

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