Add picture support from camera
Fix conflicts