[ADD] composer json
[ADD] composer json
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update ApiController.php
[BUGFIX] invalid parameter for parent::getBackUrl(). Renamed method to getZdBackUrl()
[BUGFIX] Setting property _controller to false. Exception 'Mage_Core_Exception' with message
              'Invalid block type: Mage_Adminhtml_Block_Empty_Edit_Form'
Merge pull request #21 from Zookal/master

Bugfixes