add odi 10g support
add odi 10g support
Merge branch 'dip' of github.com:aronezhang/ironmine into dip

Conflicts:
	modules/120_epm_dataimport_dip/config/locales/en.yml
	modules/120_epm_dataimport_dip/config/locales/zh.yml