Logging in should now default to username from prefs to login
Merge remote-tracking branch 'upstream/master' into jp636
Data recording much more optimized, data isn't organized until after recording has finished so that we're not looping through data while simultaneously recording.
Merge pull request #641 from stowellm/ms636

Data recording much more optimized, data isn't organized until after rec...
Cleaned logs and testing login stuffs
Removed more logs and cleaned Mike's pr
Merge pull request #642 from jaypoulz/jp636

Jp636 -- Removing the extra logs and some login mods
DFM is an iSENSE Import now.  And it works.  That's about it.
Merge pull request #643 from stowellm/ms636

DFM is an iSENSE Import now.  And it works.  That's about it.
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
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