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

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
#	.idea/libraries/com_hynnet_json_lib_2_4.xml
#	GDMS.iml

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,16 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="gdms:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/gdms_war_exploded</output-path>
-    <root id="root">
-      <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" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>