bumped version number.
updated changelog with v2.2.1 notes
Merge branch 'rb2.2.1'

Conflicts:
	web/version.php