Merge branch 'develop' into wk
change storyboard
complete

complete the qrcode search with camera
Merge branch 'wk' into develop
Merge branch 'master' into develop

Conflicts:

karbao.xcodeproj/project.xcworkspace/xcuserdata/Caland.xcuserdatad/UserI
nterfaceState.xcuserstate

karbao.xcodeproj/xcuserdata/Caland.xcuserdatad/xcdebugger/Breakpoints_v2
.xcbkptlist
Nothing but a new commit
Merge branch 'suzic' into develop
Merge branch 'develop'