Merge branch 'KWALK2' of github.com:kouretes/Monas into KWALK2

Conflicts:
	src/activities/LowLevelPlanner/ControlThread.cpp
Merge branch 'KWALK2' of github.com:kouretes/Monas into KWALK2