Unit Conversion (#882)

Merged Mohammad Nakhaee requested to merge unitConversion into develop

Merge request reports