Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts:
#	src/gdms/GDMS.java

.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>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

GDMS.iml

@@ -19,7 +19,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -30,5 +29,26 @@
       </library>
     </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="com.hynnet:json-lib:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/web/WEB-INF/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/web/WEB-INF/lib" recursive="false" />
+      </library>
+    </orderEntry>
   </component>
 </module>