Conflicts:
core/resources/datafiles/examples/Three-stage rocket.ork
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.
The BasicEventSimulationEngine conflicts were trivial and manually
resolved.