modify for RoomMisson
Merge branch 'Strategy' of https://github.com/trunone/GPPlatformMain

Conflicts:
	Data/2013sksmap.bmp
	Framework/src/strategy/modules/Stra_Task.cpp
	Linux/project/sks/Robot_Config.xml