dummy commit
Merge remote-tracking branch 'origin/develop' into jet
fixed starbucks barcode orientation
Merge remote-tracking branch 'origin/develop' into jxy
add new feature: user can customize and crop card image