bumped version number
fixed logic for determining "TBD" status for calendar offerings. refs #3310
Merge pull request #1 from ucsflibtopfstedt/bug3310

fixed logic for determining "TBD" status for calendar offerings. refs #3...
Merge branch 'rb2.2.2'

Conflicts:
	web/application/controllers/abstract_ilios_controller.php
	web/version.php
Merge pull request #152 from ucsflibtopfstedt/master

merged rb2.2.2 into master