changes in LightEditor
Fix
Merge remote-tracking branch 'origin/malak'

Conflicts:
	output/aaaa.net.xml
	output/aaaa.rou.xml
	src/com/opentrafficsimulation/editor/road/RoadEditor.java