Merge pull request #855 from mvriel/850

Fix #850: Use new templates and fix issue in writer
Merge branch 'release-2.0' into develop
Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 into develop