2013/7/4
Merge branch 'xml'

Conflicts:
	Linux/project/sks/main.cpp
network manual control done
Merge branch 'master' into Str_Transplant

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