adding info about encoding type for non utf encoded files
Merge pull request #709 from ceeram/encoding

adding info about encoding type for non utf encoded files
Fix ZendFramework URL for 2.0.4 from packages.zendframework.com
Merge pull request #833 from piomek/patch-1

Fix ZendFramework URL for 2.0.4 from packages.zendframework.com
Change repository location for ZF to https to fix errors
Add phpCodeSniffer to require-dev in composer.json
CS fixes in src
CS fixes in test
Merge pull request #964 from tommygnr/cs-fixes

CS fixes
Add composer installation instructions
Fix behat tests
Merge pull request #967 from tommygnr/fix-behat-tests

Fix behat tests
Merge branch 'release-2.0' of github.com:phpDocumentor/phpDocumentor2 into release-2.0

Conflicts:
	src/phpDocumentor/Console/Helper/ProgressHelper.php
[961]: Add handling of arguments without type in @method
Update template version constraints

Also drop "phpdocumentor/unified-asset-installer" as phpDocumentor does
not directly depend on it.
Merge pull request #968 from tommygnr/composer-install

Update template version constraints
Remove html purifier
Update dependencies
Change installed path for templates when vendored

See #597
Merge pull request #971 from tommygnr/template-install-dir

Change installed path for templates when vendored