Added Camera View
Merge branch 'taking-pictures'