commit to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	Modeling/.vpprefdata/.autoSaveProject
	Modeling/AdvancedEventProcessing.vpp
	Modeling/AdvancedEventProcessing.vpp~116
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Modeling/AdvancedEventProcessing.vpp
	Modeling/AdvancedEventProcessing.vpp~116
	Modeling/AdvancedEventProcessing.vpp~117
	Modeling/AdvancedEventProcessing.vpp~129
	Modeling/AdvancedEventProcessing.vpp~130
	Modeling/AdvancedEventProcessing.vpp~175
	Modeling/AdvancedEventProcessing.vpp~176
commit to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	Modeling/AdvancedEventProcessing.vpp
	Modeling/AdvancedEventProcessing.vpp.working2
	Modeling/AdvancedEventProcessing.vpp~175
	Modeling/AdvancedEventProcessing.vpp~176
	Modeling/AdvancedEventProcessing.vpp~177
	Modeling/AdvancedEventProcessing.vpp~379
	Modeling/AdvancedEventProcessing.vpp~380
	ProcessCoordinatorDevelopmentWS/.metadata/.log
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/BPCoordinator/.markers
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/BPCoordinator/.markers.snap
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/BPCoordinator/org.eclipse.jdt.core/state.dat
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/EnterpriseEventProcessing/.markers
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/EnterpriseEventProcessing/.markers.snap
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/EnterpriseEventProcessing/org.eclipse.jdt.core/state.dat
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/JMSProducer/.markers
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/JMSProducer/.markers.snap
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.projects/JMSProducer/org.eclipse.jdt.core/state.dat
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.root/11.tree
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.core.resources/.snap
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.jdt.core/3402276793.index
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.core/nexus/c8f4618e1e1b35a56f61dc490e087a81/segments.gen
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.core/workspacestate.properties
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
	ProcessCoordinatorDevelopmentWS/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	ProcessCoordinatorDevelopmentWS/BPCoordinator/target/classes/META-INF/maven/Marisoft/BPCoordinator/pom.properties
	ProcessCoordinatorDevelopmentWS/EnterpriseEventProcessing/target/classes/META-INF/maven/Marisoft/JMSConsumer/pom.properties
	ProcessCoordinatorDevelopmentWS/JMSProducer/target/classes/META-INF/maven/Marisoft/JMSActiveMQ/pom.properties
commit to push