Merge for develop
Camera modules
Merge branch 'feature/ModuleCamera' into develop