Nothing really
Merge remote-tracking branch 'upstream/master' into vb573
DFM reorganizes data with no associated experiment and successfully uploads to that experiment.  Cleaned up some extraneous logs and code comments.
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
Fixed some bugs
Merge remote-tracking branch 'upstream/master' into vb573
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
Merge pull request #648 from stowellm/ms636

Fixed data saving to save by session name instead of saving every single...
Merge pull request #649 from balabhv/vb573

Fixed some bugs
added rSENSE person class
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute