modification to the main file and Vehicle editor
commit to check brenda branch
new data
check out brenda
New vehicle editor
Python for Brenda
Merge branch 'abdalla' into brenda

Conflicts:
	output/random.trip.xml
	src/com/opentrafficsimulation/Main.java
	src/com/opentrafficsimulation/connector/utility/ConnecterConverter.java
	src/com/opentrafficsimulation/connector/utility/ConnectorType.java
	tools/sumolib/trip/sumolib/__init__.pyc
	tools/sumolib/trip/sumolib/net/__init__.pyc
	tools/sumolib/trip/sumolib/net/connection.pyc
	tools/sumolib/trip/sumolib/net/edge.pyc
	tools/sumolib/trip/sumolib/net/lane.pyc
	tools/sumolib/trip/sumolib/net/node.pyc
	tools/sumolib/trip/sumolib/net/roundabout.pyc
	tools/sumolib/trip/sumolib/output/__init__.pyc
	tools/sumolib/trip/sumolib/output/dump.pyc
	tools/sumolib/trip/sumolib/output/inductionloop.pyc
	tools/sumolib/trip/sumolib/poi.pyc
merged with abdalla branch