Added ability to take and save a picture.
Merged with photo_dev