Mod conf file
Merge remote-tracking branch 'origin/asier' into asier

Conflicts:
	opentripplanner-webapp/src/main/webapp/js/otp/config.js