update
Merge ticket/master

Conflicts:
	modules/settings/fare_classification.php