Added new Camera related code to DataCollector.

Includes:
- an extended UIImagePickerClass which allows dismissal of the view controller
- New methods for both automatic and manual
- partially linked (iphone only methods for testing pictures)
- potentially helpful log messages
Merge remote-tracking branch 'upstream/master' into jp636
Better log messages
Merge pull request #645 from jaypoulz/jpTEMP

Jp temp -- Camera Related implementation basics