begin
Merge remote-tracking branch 'origin/develop' into jxy

Merge:
tab bar controller
still add thumbnail
Merge remote-tracking branch 'origin/develop' into jxy
Add thumbnail and barcode textiled