Allow ZF 2.3 in projects using phpDoc
Merge branch 'master' of github.com:phpDocumentor/phpDocumentor2
Merge branch 'develop'

Conflicts:
	composer.json
Merge branch 'develop'
Phar should be copied from right location
Updated CHANGELOG for 2.8.0
Merge branch 'master' of github.com:phpDocumentor/phpDocumentor2