gui
gui 2
xx
Merge remote-tracking branch 'origin/master'

Conflicts:
	marketGarden.test/MarketHistoryInfo_test.cs
	marketGarden/Readers/BtceReader.cs
	marketGarden/Readers/CryptoTradeReader.cs
	marketGarden/Readers/VirCurexReader.cs
	marketGardenApi/App_Start/WebApiConfig.cs
	marketGardenApi/Controllers/CronController.cs
	marketGardenApi/data.tsv
	marketGardenApi/index.html
	marketGardenApi/marketGardenApi.csproj
	packages/Newtonsoft.Json.5.0.6/lib/net45/Newtonsoft.Json.xml
data recorder
data recorders