[Data] ORI has been renamed into OPTD (OpenTravelData).
Merge branch 'trunk' into releases