2014-01-07 simulator update
Merge branch 'master' of https://github.com/naiad-auv/naiad-auv-software

Conflicts:
	examples/Simulator_Motio_Control_Test/src/main.adb