Merge pull request #11 from stagebloc/camera

Camera Module Integration
Merge branch 'master' into camera