extracted energy model from vehicle
extracted vehicle dimensions
extracted TrafficLightApproaching
Merge branch 'alternatives' of https://github.com/movsim/movsim into
alternatives

Conflicts:
	core/src/main/java/org/movsim/simulator/vehicles/Vehicle.java