Merge branch 'hotfix/phpbnl-tutorial-slides'
Merge branch 'develop'

Updated to ZF 2.1
use zend server php binary in deploy script
Merge branch 'hotfix/php' into develop