added view
Merge branch 'camera' into dev