Adding names to splash screen
Using connector to run NETCONVERT
Merge remote-tracking branch 'origin/master' into Malak
Merge remote-tracking branch 'origin/master' into Malak
all route files can be named as the map,the original route named mapnameOriginal.rou.xml and new one named mapname.rou.xml
Merge branch 'master' of https://github.com/macromania/OpenTrafficSimulation into Malak

Conflicts:
	src/com/opentrafficsimulation/editor/light/LightEditor.java
	src/com/opentrafficsimulation/splashScreen/splash.java
	src/com/opentrafficsimulation/utility/constants/AppConstants.java
Merge branch 'master' of https://github.com/macromania/OpenTrafficSimulation into Malak
Testing...
Merge branch 'master' of https://github.com/macromania/OpenTrafficSimulation
Merge remote-tracking branch 'origin/brenda'

Conflicts:
	ResultGrid.rou.xml
Adding new functionality rgarding to TL and report
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
Bug fixing
Testing