changed tradeStrategyEvaluator to support a mapping
Merge branch 'master' of https://github.com/zSakare/SENG3011