Merge pull request #897 from YaleSTC/494_import_equipment

[v3.4] 494 import equipment
Merge pull request #898 from YaleSTC/494_import_equip_master

resolves #494