regenerated output
Merge branch 'develop'

Conflicts:
	plot/plot_config.json