Merge branch 'master' into develop
add barcode sample
Merge branch 'develop'