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
Merge branch 'master' into develop