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 pull request #148 from ucsflibtopfstedt/master

script cleanup
Merge pull request #149 from ucsflibtopfstedt/master

cleanup
Merge pull request #150 from ucsflibtopfstedt/master

purged unused/obsolete utility methods
Merge pull request #151 from ucsflibtopfstedt/master

cleanup.
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
bugfix: replaced improper calls to escape() function with encodeURIComponent(). refs #3632
bugfix: replace improper calls to escape() function with encodeURIComponent(). added request param encoding for new instructor creation. refs #3632
added request parameter encoding where applicable. replaced calls to escape() function with encodeURIComponent(). refs #3632
replace any calls to urldecode() with rawurldecode() since the former erroneously replaces + with blank space. refs #3632
Merge pull request #153 from ucsflibtopfstedt/bug3632

fixes url encoding/decoding issues with certain characters.
Merge branch 'rb2.2.2'

Conflicts:
	web/application/controllers/abstract_ilios_controller.php
	web/application/controllers/group_management.php
	web/application/views/group/group_manager_transaction.js
	web/application/views/home/dashboard_transaction.js
	web/application/views/management/management_transaction.js
Merge pull request #154 from ucsflibtopfstedt/master

merged rb2.2.2 into master
updated changelog with entries for v2.2.2 release.
Merge pull request #155 from ucsflibtopfstedt/rb2.2.2

updated changelog with entries for v2.2.2 release.
fixed learning material description display in course summary view. refs #3636
Merge pull request #156 from ucsflibtopfstedt/bug3636

fixed learning material description display in course summary view. refs...