implemented Contractor.import_xml & fixed OshaParser
Merge branch 'import_like_a_boss'