modify for MakeSound and etIdle
for merge master
Merge branch 'master' into Strategy

Conflicts:
	Framework/include/Stra_Task.h
	Framework/include/StrategyStatus.h
	Framework/src/strategy/modules/Stra_AStar.cpp
	Framework/src/strategy/modules/Stra_PathPlan.cpp
	Framework/src/strategy/modules/Stra_Task.cpp
	Framework/src/strategy/modules/Stra_VelocityControl.cpp
	Linux/project/sks/Robot_Config.xml
Merge branch 'master' of https://github.com/trunone/GPPlatformMain into Strategy

Conflicts:
	Framework/src/strategy/modules/Stra_Task.cpp
	Linux/project/sks/Robot_Config.xml
	Linux/project/sks/main.cpp
add ENABLE_SIMULATOR
fix odmeter sperate move & rotate caculate
add new avoid algorithm VFH*
add ENABLE_MANUAL sw
Merge branch 'Strategy' of https://github.com/trunone/GPPlatformMain into Strategy

Conflicts:
	Framework/src/strategy/modules/Stra_Task.cpp
	Linux/project/sks/main.cpp
add timer
first stage patrol finish( lack room mission & touch switch motion)
fix locatoin error & add touch button motion
add DXL's Strategy and change main.cpp
Merge branch 'Strategy' of https://github.com/trunone/GPPlatformMain

Conflicts:
	Framework/include/StrategyStatus.h
	Framework/src/strategy/StrategyManager.cpp
	Linux/project/sks/main.cpp