Map @Type to property OType
Create OTypeFieldMapping class for mapping @Type
Merge branch 'Lithl-master'