Merge pull request #637 from ezimuel/fix/zftool

Changed the Manual Installation of ZFTool
2.1.1 release
Merge branch 'releases/2.1.1'
Bump to 2.1.2dev
Merge branch 'version/bump'

Bump to 2.1.2dev
nueva traduccion
Merge commit 'refs/pull/638/head' of github.com:zendframework/zf2-documentation into hotfix/es-unit-testing
[#638] typos
Forward port #638

Conflicts:
	docs/languages/en/conf.py