fixed mapping in classes Deal, DealStatus, Measurement
Merge with remote branch