camera and photo
Merge branch 'master' of https://github.com/sticknor/CMTechnologyApp
merged'

a:
l: