some fixes
Merge branch 'master' of https://github.com/SamArmand/ECCC

Conflicts:
	www/institutions/alberta.html