removed duplicate files
Merge remote-tracking branch 'upstream/master' into version-1-bugfixes
added validation for quantity, for 0 in onetimesale
uploadstatus changed according to requirements
conflict cleared
client prosepect set flag-false
removed .orig files
removed conflict files
adjustment issues cleared
upstream merged into local code , adjustment code cleared
Merge pull request #43 from rahman38/master

Adjustment issues fixed