no message
no message
no message
Merge commit '4b68a342bcb2b200b80c02304724069399f097a0' into velocity_scaling

Conflicts:
	MD_main
	MD_main.cpp
Merge branch 'velocity_scaling'