outPutChart
Merge remote-tracking branch 'test/master'

Conflicts:
	nodejs.iml
	public/js/validation/scenario_data.js