..
Merge remote-tracking branch 'upstream/master'
..
issues on addons
..
Merge remote-tracking branch 'upstream/master'
Merge pull request #130 from Rakeshadlagatta/master

saletype is retriving in device listing
Merge pull request #131 from Rakeshadlagatta/obsplatform-2.03

saletype is retriving in device listing
Merge pull request #132 from Ranjith15/master

After test Add on services
paypalChanges
.
paypal changes
Merge pull request #133 from LAshokReddy556/obsplatform-2.03

paypalChanges
Merge pull request #134 from LAshokReddy556/master

Paypal Change
advance search to clients
Merge remote-tracking branch 'upstream/obsplatform-2.03' into obsplatform-2.03
conflict