Merthyr progress codes
Don't break on broken teacher link for timetables
Show error if view form config is borked
Merge branch 'merthyr' of https://github.com/sdc/leap into merthyr
Finally rid myself of the horrible hack to get affiliations from merthyr. Looks at headers as well as env variables for shib authentication.
Collected Merthyr changes
Merge branch 'merthyr' into merthyr_merge

Conflicts:
	Gemfile.lock
	app/models/ebs/address.rb
	app/models/ebs/attendance.rb
	app/models/ebs/person.rb
	app/models/person.rb
	lib/mis_connectors/ebs_connector.rb
Fixes from merthyr merge after testing