ss
Merge branch 'base'

Conflicts:
	org.sjtu.radlab.breeze.diagram/.classpath
	org.sjtu.radlab.breeze.diagram/.settings/org.eclipse.core.resources.prefs
	org.sjtu.radlab.breeze.diagram/META-INF/MANIFEST.MF
	org.sjtu.radlab.breeze.diagram/messages.properties
	org.sjtu.radlab.breeze.diagram/plugin.properties
	org.sjtu.radlab.breeze.diagram/plugin.xml
	org.sjtu.radlab.breeze.diagram/resource/NuSMV
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/commands/GokuCreateCommand.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/parts/ComponentEditPart.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/parts/ComponentNameEditPart.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/parts/ConnectorEditPart.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/parts/PortEditPart.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/parts/ProductionEditPart.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/edit/policies/BreezeCanonicalEditPolicy.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/BreezeCreationWizard.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/BreezeDiagramEditor.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/BreezePaletteFactory.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/BreezeVisualIDRegistry.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/DiagramEditorContextMenuProvider.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/part/Messages.java
	org.sjtu.radlab.breeze.diagram/src/BreezeModel/diagram/providers/BreezeElementTypes.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/common/BreezeGk.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/common/ListenerExtractSafetyAttr.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/common/SafetyAttribute.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/event/impl/ActionAddLTLSPEC.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/main/BreezeXMLParser.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/main/MainTranslator.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeArch.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeConnection.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeEvent.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeMode.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeModeTransition.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeNode.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezeObject.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/compiler/model/BreezePort.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/DiagramEditorSelectChangeListener.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/MKVEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/MKVModelEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/MPRModelEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/PredictReliability.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/RBDEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/RBDModelEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/SafetyEditor.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionAddEvent.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionAddMode.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionAddModeMKV.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionAddModeMPR.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionAddModeRBD.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionNodeAddTransition.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionNodeRmTransition.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionNodeRmTransitionMKV.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionNodeRmTransitionMPR.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionNodeRmTransitionRBD.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionPortAddTransition.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionPortRmTransition.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionRmEvent.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ActionRmMode.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/EventTableLabelProvider.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/EventTextSupport.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeComboSupport.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeComboSupportMKV.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeComboSupportMPR.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeComboSupportRBD.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeOSDComboSupport.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeTableLabelProvider.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeTextSupport.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeTextSupportMKV.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeTextSupportMPR.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/ModeTextSupportRBD.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/editor/support/TransitionComboSupport.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/menu/ActionCheckDeadLock.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/menu/ActionFmea.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/menu/InitCorrectnessModel.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/menu/InitSafetyModel.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/navigator/BreezeExplorer.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/ui/view/ViewNuSMV.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/util/BreezeModel2SA.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/util/GetNuSMVTrace.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/util/InitModelUtil.java
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/util/RBDXMLParser.java
Merge branch 'goku'

Conflicts:
	org.sjtu.radlab.breeze.diagram/plugin.xml
	org.sjtu.radlab.breeze.diagram/src/com/goku/breeze/util/InitModelUtil.java