Modified camera code
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Getting closer to being able to upload images.
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Merge remote-tracking branch 'upstream/master' into jp646
Fixed? merge conflicts'