Local changes
remove .DS_Store
Merge branch 'master' of https://github.com/wenhuizhao/barcodescanios

Conflicts:
	.DS_Store
	CodeScanner/.DS_Store
	CodeScanner/CodeScanner.xcworkspace/xcshareddata/CodeScanner.xccheckout
add backed call