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
Some fixes and updates!

There's some typo, logic fixes and some updates for the "Nesting View Models" exemples.
Updated deprecated class import and type hinting!
Merge branch 'master' into develop
Fixed the bcrypt doc about cost parameter
Fixed a sentence on bcrypt
Merge branch 'master' into develop
Merge branch 'hotfix/669' into develop

Forward port #669
Merge branch 'releases/2.1.2' into develop

2.1.2 readiness

Conflicts:
	docs/languages/en/conf.py
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py
Merge branch 'releases/2.1.3' into develop

2.1.3 readiness

Conflicts:
	docs/languages/en/conf.py
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py
Merge branch 'master' into develop
Update forms-and-actions.rst

Made a few textual changes that I think make things a bit more readable.