camera functionality implemented
Merge branch 'camera'

Merge necesssary to enable camera functionality