bugfix for failed transaction handling in EDS student sync
Merge pull request #107 from ucsflibtopfstedt/rb2.2.1

bugfix for failed transaction handling in EDS student sync
Merge pull request #108 from ilios/rb2.2.1

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

Conflicts:
	web/version.php
Merge branch 'master' into bug3284