Conflicts:
	org.eclipse.ice.build/pom.xml
	src/org.eclipse.ice.analysistool/src/org/eclipse/ice/analysistool/IAnalysisAsset.java
	src/org.eclipse.ice.client.widgets.rcp/META-INF/MANIFEST.MF
	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeController.java
	src/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java
	src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java
	src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/TreeComposite.java
	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Custom2DShape.java
	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Polygon.java
	src/org.eclipse.ice.item/META-INF/MANIFEST.MF
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
	src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekWriter.java
	src/org.eclipse.ice.viz.service.jme3/META-INF/MANIFEST.MF
	src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizService.xml
	src/org.eclipse.ice.viz.service.jme3/build.properties
	src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
	src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/connections/VisItConnectionPreferencePage.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IVizService.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/CellColumnLabelProvider.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/PortEntryContentProvider.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/TableComponentContentProvider.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/datastructures/VizObject.java
	tests/org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF
	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
	tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java
	tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java
	tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryContentProviderTester.java
	tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java