Merge remote-tracking branch 'upstream/master' into ms590
Started working on QR Code implementation using free app pic2shop instead of ZXing.
Started working on QR code and upload dialogs
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #604 from balabhv/vb573

QR Code and upload dialog started
Can record data without an experiment selected
Merge remote-tracking branch 'upstream/master' into ms590
Merge pull request #605 from stowellm/ms590

 Can record data without an experiment selected
QR code working
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #606 from balabhv/vb573

QR Code stuff works
Scanning QR Codes (somehow, and magically) works in Manual.  Will implement Automatic later.
Merge pull request #607 from stowellm/ms590

Scanning QR Codes (somehow, and magically) works in Manual.  Will implem...