Merge pull request #353 from Rakeshadlagatta/obsplatform-2.03

saleType added to device listing
advance search to clients
Merge remote-tracking branch 'upstream/obsplatform-2.03' into obsplatform-2.03