Merge remote-tracking branch 'origin/master' into malak

Conflicts:
	output/aaaa.net.xml
	output/aaaa.rou.xml
	src/com/opentrafficsimulation/editor/road/RoadEditor.java
Cleanup
Merge branch 'master' of https://github.com/macromania/OpenTrafficSimulation into malak

Conflicts:
	output/aaaa.net.xml
	output/aaaa.rou.xml