Merge pull request #643 from stowellm/ms636

DFM is an iSENSE Import now.  And it works.  That's about it.
Merge pull request #644 from stowellm/ms636

DFM reorganizes data with no associated experiment and successfully uplo...
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
Fixed some bugs and added padding
Merge pull request #647 from Rajia/ra553

Fixed some bugs and added padding
Fixed data saving to save by session name instead of saving every single point, upload extra data points after recording has stopped