commiting to merge
change
ve
all route files can be named as the map,the original route named mapnameOriginal.rou.xml and new one named mapname.rou.xml
New Vehicle Editor
remove some unused files
List to store rando routes
Testing...
Merge branch 'master' of https://github.com/macromania/OpenTrafficSimulation
Merge remote-tracking branch 'origin/brenda'

Conflicts:
	ResultGrid.rou.xml
Border size correction
Merge remote-tracking branch 'origin/abdalla'

Conflicts:
	.DS_Store
	src/com/opentrafficsimulation/editor/MainEditor.java
	src/com/opentrafficsimulation/editor/vehicle/Add.java
	src/com/opentrafficsimulation/editor/vehicle/Deleted.java
	src/com/opentrafficsimulation/editor/vehicle/VehicleEditor.java
	src/com/opentrafficsimulation/editor/vehicle/WriteXMLTier2.java
modified for correct vType format
Merge remote-tracking branch 'origin/Malak'

Conflicts:
	src/com/opentrafficsimulation/connector/TraciConnector.java
Merge remote-tracking branch 'origin/brenda'
Merge remote-tracking branch 'origin/abdalla'
Merged with Abdalla
Testing
no data