Dodging merge conflicts
Merge remote-tracking branch 'upstream/master' into jp508
Duck, it's another conflict
Just dodged another merge conflict
Merge pull request #625 from nickavv/parachute

Added rSENSE Test application
Finished implementing Rename, Delete, and Select Experiment for the QueueUploaderView long-press gestures on the QueueCells.
Merge remote-tracking branch 'upstream/master' into jp508
Merge pull request #626 from stowellm/ms618

Finished implementing Rename, Delete, and Select Experiment for the Queu...
Remove the old touch listener and added color changing to selected cells in both queue cells and sensor cells
Merge pull request #627 from stowellm/ms618

Remove the old touch listener and added color changing to selected cells...
Made zee menu look like Virinchi's.  And this is a working version of that except for the parts that Jeremy broke, but whatever.  *Sigh* Whatever
Merge remote-tracking branch 'upstream/master' into ra553
Merge pull request #628 from Rajia/ra553

Ra553 --See commit messages
Added data saving to manual -- to be tested
Merge remote-tracking branch 'upstream/master' into jp508
Merge pull request #629 from jaypoulz/jp508

Jp508 -- Potentially finished added data saving to manual
Fixed Manual data saving after Jeremy implemented it
Added a Change Description option to saved data sets
Merge pull request #630 from stowellm/ms618

Fixed manual data saving, added Change Description dialog option to Queue Saver
Changed queue layout's header text to inform user to press-and-hold data sets to edit them.  I personally think this beats changing to the iOS "Edit Mode" table view.  Also got rid of the "Select Experiment" button if your data set was recorded with an initial experiment.