merge camera
Merge branch 'camera' into develop
tagging branch
test whether tagging included
add strings
add layout file
merging camera to tagging
trying to fix tagging error
Merge branch 'tagging' into develop
update camera on develop
new camera branch