Merge pull request #339 from Rakeshadlagatta/obsplatform-2.03

sortBy to servicemapping
conflict
Merge pull request #340 from Rakeshadlagatta/master

fix to inventory items
Merge pull request #342 from Rakeshadlagatta/obsplatform-2.03

fix to inventory items
fix to delete item popup
Merge remote-tracking branch 'upstream/obsplatform-2.03' into obsplatform-2.03
Merge branch 'obsplatform-2.03'