Merge branch 'hotfix/composer-phar' into develop
Merge branch 'hotfix/rewrite-rules' into develop
Merge branch 'hotfix/rewrite-rules' into develop
Merge branch 'hotfix/footer' into develop
Merge branch 'posts/openshift-cron' into develop
Merge branch 'hotfix/2013' into develop

Update to 2013
Merge branch 'hotfix/projects' into develop
Merge branch 'hotfix/phpbnl-tutorial-slides' into develop
Successfully 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