Aut demo 1.0
Merge branch 'dev' of github.com:smeyel/M3 into dev

Conflicts:
	M3Host/src/RemoteTrackerDevice.cpp