Conflicts:
	org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.reactoreditor.lwr/src/org/eclipse/ice/client/widgets/reactoreditor/lwr/PlantAnalysisView.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/GeometryComponent.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java
	org.eclipse.ice.item/META-INF/MANIFEST.MF
	org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekWriter.java
	org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF
	org.eclipse.ice.reactor/META-INF/MANIFEST.MF
	org.eclipse.ice.reactorAnalyzer/META-INF/MANIFEST.MF
	org.eclipse.ice.repository/ice.product
	org.eclipse.ice.tablecomponenttester/META-INF/MANIFEST.MF
	org.eclipse.ice.tablecomponenttester/src/org/eclipse/ice/tablecomponenttester/TableComponentTester.java
	org.eclipse.ice.viz.service.geometry.test/src/org/eclipse/ice/viz/service/geometry/shapes/test/AbstractShapeTester.java
	org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/shapes/AbstractShape.java
	org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/geometry/JME3GeometryCanvas.java
	org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/JME3MeshCanvas.java
	org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/JME3MeshVizService.java
	org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/GeneralInfoSection.java
	org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/TabDescriptorProvider.java
	org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
	org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IVizService.java
	org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
	pom.xml

Signed-off-by: Robert Smith <SmithRW@ornl.gov>