Merge remote-tracking branch 'origin/Mandip'
Added Card Scanner
Merge remote-tracking branch 'origin/master' into Mandip