Mini refactor
Camera & Gallery refactor
Merge pull request #501 from owdqa/feature/camera_gallery_refactor

Feature/camera gallery refactor