Name changes to adcps.
Update ctdmo parser.
Added ctdmo parser tests.
New CO test file.
Rolled back adcps changes, moved to another branch
Roll back adcp test_driver.
Went back too far for test_adcps.
Updated adcp parameter names and converted driver to multiple harvester driver.
Added offset messages to driver tests, fixed issue in ctdmo parser.
Added test for full node59p1.dat file.
Added full node59p1.dat file test.
Merge branch 'test_branch', remote branch 'upstream/master' into test_branch
Undid this merge, no file changes but it still wants me to commit.
Merge branch 'mflm_ctdmo', remote branch 'upstream/master' into test_branch

Conflicts:
	mi/dataset/driver/mflm/adcp/test/test_driver.py
Merge seems to have rolled back somethings, moved back to previous versions.
adcps parameter name changes.
Upstream merge, includes sio mule common driver and unprocessed fix.
Rename parameters in results files.
Upstream merge with conflicts.
Merge branch 'master' into test_branch

Conflicts:
	mi/dataset/driver/mflm/ctd/driver.py
	mi/dataset/driver/sio_mule/sio_mule_single_driver.py
	mi/dataset/driver/vel3d_k/wfp/resource/strings.yml
	mi/dataset/driver/vel3d_k/wfp_stc/__init__.py
	mi/dataset/driver/vel3d_k/wfp_stc/resource/strings.yml
	mi/dataset/parser/sio_mule_common.py
	mi/idk/unit_test.py
	mi/instrument/um/thsph/ooicore/test/__init__.py
	mi/platform/driver/demo/resource/strings.yml
	mi/platform/driver/demo/test/__init__.py
Fixed some bad merge items.