make intersession display the same as exception and all for french
Merge branch 'master' of github.com:ualbertalib/LibraryHoursLocations
Conflicts:
	hours_portal/includes/UofAHeader.inc.php