Merge remote-tracking branch 'flathat/master' into develop

Conflicts:
	fannie/classlib2.0/data/models/BasicModel.php
	fannie/cron/management/CronManagementPage.php
	fannie/item/itemMaint_WEFC_Toronto.php