Merge branch 'master' of https://github.com/videomusik/M3T3

Conflicts:
	software/lib/M3T3/MotionT3.h
Accepting changes