Emision Objects
Emission and MySQL
Merge remote-tracking branch 'origin/abdalla'

Conflicts:
	build/classes/com/opentrafficsimulation/screen/simulation/SimulationScreen$1.class
	build/classes/com/opentrafficsimulation/screen/simulation/SimulationScreen.class
	output/asd.net.xml
	output/asd.rou.xml
	output/asd.trips.xml
	output/asdOld.rou.alt.xml
	output/asdOld.rou.xml
	src/com/opentrafficsimulation/screen/simulation/SimulationScreen.java