Bumped version number to 2.2
Merge branch 'release-2.2' into develop