Framework updated
s
Merge branch 'wk' into develop

Conflicts:
finished merge

finished merge by week
Merge branch 'develop' into wk
change storyboard
complete

complete the qrcode search with camera