Update ApiController.php
[ADD] composer json
Merge pull request #18 from rcro/patch-1

Fix typing error on ApiController.php
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update ApiController.php
Merge branch 'master' into zookal-1.2.0

* master:
  [ADD] composer json
  Update ApiController.php
Merge branch 'zookal-1.2.0' of github.com:Zookal/magento_extension into zookal-1.2.0

* 'zookal-1.2.0' of github.com:Zookal/magento_extension:
  [BUGFIX] Zendesk_Zendesk_Block_Adminhtml_Create_Edit::getBackUrl() should be compatible with Mage_Adminhtml_Block_Widget_Form_Container::getBackUrl()
Update composer