Test

Test
Merge branch 'master' of https://github.com/moohdyy/theFOREXproject

Conflicts:

	StrategySimulatorJAVA/TradingStrategyTester/src/strategies/JapaneseCandlesticksStrategy.java