Merge remote-tracking branch 'remotes/origin/wmj'

# Conflicts:
#	GDMS.iml

.idea/artifacts/gdms_Web_exploded.xml

@@ -2,7 +2,7 @@
   <artifact type="exploded-war" name="gdms:Web exploded">
     <output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
     <root id="root">
-      <element id="javaee-facet-resources" facet="gdms/web/Web" />
+      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
           <element id="module-output" name="gdms" />

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/gdms.iml" filepath="$PROJECT_DIR$/gdms.iml" />
+      <module fileurl="file://$PROJECT_DIR$/GDMS.iml" filepath="$PROJECT_DIR$/GDMS.iml" />
     </modules>
   </component>
 </project>