Merge remote-tracking branch 'origin/cron_mage'
form bug fixes
form bug fixes
Merge branch 'master' into cron_mage

Conflicts:
	module/Api/src/Api/Magento/Controller/MagentoController.php
	module/Api/src/Api/Magento/Model/MageSoap.php
	module/Api/src/Api/Magento/Model/MagentoTable.php
form bug fixes
form bug fixes
Merge branch 'master2'

Conflicts:
	module/Content/src/Content/ContentForm/Model/ProductsTable.php
form bug fixes
In model MagentoTable I have my soapbundle array inside the else and not outside. I was getting an ajax error.
form bug fixes
resolved merge conflicts and merged master in.