Dodging merge conflicts
Merge remote-tracking branch 'upstream/master' into jp508
Duck, it's another conflict
Just dodged another merge conflict
Merge remote-tracking branch 'upstream/master' into jp508
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.
Merge pull request #631 from stowellm/ms618

Changed queue layout's header text to inform user to press-and-hold data...
broke API calls into their own class
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
Added UITextField validation across all View Controllers and Alert View dialogs for every text field in the application.  Also fixed a bug in Manual where if you clicked in a scrollview element (the view gets pushed up to show the text field you edit), then click session name (which doesn't push the view up), then dismiss the keyboard, the view wouldn't go back down - now it does.
Merge pull request #632 from stowellm/ms618

Added UITextField validation across all View Controllers and Alert View ...
rotatin working
Merge remote-tracking branch 'upstream/master' into vb573