updated format for json changes
merging backtest_dev2 and new models from pull request with proper syntax in algorithm