Conflicts:
	org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF
	org.eclipse.ice.materials/data/userMatDB.xml
	org.eclipse.ice.materials/src/org/eclipse/ice/materials/XMLMaterialsDatabase.java
	org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekReader.java
	org.eclipse.ice.reflectivity.ui/plugin.xml
	org.eclipse.ice.repository/ice.macosx_product.launch
	org.eclipse.ice.tablecomponenttester/src/org/eclipse/ice/tablecomponenttester/TableComponentTester.java
	org.eclipse.ice.target.mars/mars.target


Signed-off-by: amccaskey <mccaskeyaj@ornl.gov>