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
Merge branch 'release-2.0'

Conflicts:
	composer.json
	composer.lock
	docs/manual/for-users/commands/project_run.rst
Removed clover.xml generation due to zend mm heao corruption
Add a branch alias to composer.json
Merge pull request #983 from tommygnr/patch-1

Add a branch alias to composer.json
Merge branch 'master' into develop
Update README file with latest information
Refactor Parser for readability and maintainability and add test
Update build file with additional demos
One should not hurry a configuration update
Remove impossible test

zend.script_encoding won't respond to ini_set so it will always be invalid
Change profiling to an external installation of XHGUI
#979: Add Twig Cache to reduce compilation time
Fix fatal error introduced by a refactoring in 2.1
[#989]: Update monolog requirement to 1.6

phpDocumentor now uses the ErrorHandler of Monolog but that wasn't available
until 1.6. Given that the composer.json is locked on 1.4 we need to bump the
requirement to 1.6.
Merge pull request #991 from mvriel/989

[#989]: Update monolog requirement to 1.6