Merge branch 'Strategy'

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