Merge branch 'version/bump'

Back to dev version
2.2.0 readiness
Merge branch 'releases/2.2.0' into develop

2.2.0 readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php