Merge branch 'hotfix/hot-deploy' into develop
Merge branch 'hotfix/api-update' into develop
Merge branch 'hotfix/composer-cache' into develop
Merge branch 'hotfix/composer-phar' into develop
Updated to ZF 2.1
Merge branch 'feature/zf-2.1.1' into develop

Updated to ZF 2.1
Merge branch 'develop'

Updated to ZF 2.1