Version bump

- bump to 2.2.0dev
Merged resolved
Merge branch 'master' into develop
Merge branch 'Ore4444-patch-68' into develop
Merge branch 'blanchonvincent-feature/docs/languages/en/modules/zend.test' into develop
Merge branch 'hotfix/637' into develop

Forward port #637
Forward port #638

Conflicts:
	docs/languages/en/conf.py
Fix file names for navigation view helpers in index.rst
Merge pull request #641 from froschdesign/hotfix/navigation

Fix file names for navigation view helpers in index.rst
Update docs/languages/en/modules/zendservice.akismet.rst

fixed syntax errors in top two examples
Merge pull request #643 from mvargeson/patch-1

Update docs/languages/en/modules/zendservice.akismet.rst
Update docs/languages/en/modules/zend.di.instance-manager.rst
Merge pull request #644 from rixrix/patch-1

Update docs/languages/en/modules/zend.di.instance-manager.rst
Fix code explanation!
Minor fix
Fix for form class name!
Minor fix
element.captcha - Fixed slashes!
element.checkbox - Fixed link!
element.collection - Some minor fix