Mod conf file
Primer commit a brach nuevo "asier"
Commit
Merge remote-tracking branch 'origin/asier' into asier

Conflicts:
	opentripplanner-webapp/src/main/webapp/js/otp/config.js
Prueba Planner
Commit
Code changes for server interoperability via XML-TripPlan serialization
Updated xml parsing & maven dependencies
SharedVertexGraphBuilderImpl
commit test