Fixes a problem w/ upgrade_calendar upgrade script referencing old core/definitions location, reverts version file back to 'develop' type.
Fixes a bad reference call in navigationController