merge in zend skeleton app
merge in zend skeleton app