undo local commit
Merge branch 'master' of https://github.com/dwaynemac/attendance
[#64160542] add archive value when importing trial lesson
[#64160542] open file according to environment
Merge branch 'master' into 64160542-import-archived-trial-lessons

Conflicts:
	app/models/import.rb
	app/models/trial_lesson_import.rb