Added analytic tools that generate CSV files
Fixed merge conflict