#14
Merge branch 'master' into dev

Conflicts:
	DATA_Statistics/Road_analysis/traf_state/traf_state_day.php