Added blank colorOptionsPane in preferences
Merge branch 'master' into set-color-defaults-in-options
Merge branch 'master' into set-color-defaults-in-options
Added additional panel for color defaults
Merge branch 'master' into set-color-defaults-in-options
Rearranged preferences tabs, added default custom Mach number,
Split all panels, implement new launch preferences panel.
Finished simulation preferences panel.
Removed display tab for now.  Preference reorganization complete.
Merge branch 'set-color-defaults-in-options' into Craig-Master

Conflicts:
	swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java