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

# Conflicts:
#	src/servlet/S_CollegeFillOpeningReportOpinion.java
#	src/servlet/S_CollegeFillScoreOpinion.java
#	src/servlet/S_MentorFillOpeningReportOpinion.java
#	src/servlet/S_MentorFillReview.java
#	src/servlet/S_ReviewerFillReview.java
#	src/servlet/S_SchoolFillScoreOpinion.java
#	src/servlet/S_SecretaryFillOpeningReportRecord.java
#	src/servlet/S_TeacherTeamFillScoreOpinion.java

.idea/artifacts/GDMS_war_exploded.xml

@@ -10,6 +10,8 @@
         <element id="directory" name="lib">
           <element id="library" level="project" name="lib" />
           <element id="library" level="project" name="tomcat-lib" />
+          <element id="extracted-dir" path="D:/software engineering/tomcat/apache-tomcat-8.5.37/lib/tomcat-jdbc.jar" path-in-jar="/" />
+          <element id="file-copy" path="$PROJECT_DIR$/deployment/mariadb-java-client-2.3.0.jar" />
         </element>
       </element>
     </root>

.idea/dataSources.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="@localhost:gdms" uuid="356b1cbb-8e8d-401f-bdfc-b3e917bc8301">
+    <data-source source="LOCAL" name="gdms@localhost" uuid="8fdf8c26-c4fe-4cb5-9941-72889c26fde4">
       <driver-ref>mariadb</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>

.idea/libraries/tomcat_lib.xml

@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="tomcat-lib">
     <CLASSES>
-      <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib" />
+      <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib" recursive="false" />
+    <jarDirectory url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/lib" recursive="false" />
   </library>
 </component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

GDMS.iml

@@ -17,14 +17,37 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="10" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/webapps/docs/appdev/sample/src" />
+          <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/webapps/examples/WEB-INF/classes" />
+          <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/webapps/examples/WEB-INF/jsp/applet" />
+          <root url="file://D:/software engineering/tomcat/apache-tomcat-8.5.37/webapps/examples/jsp/plugin/applet" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://D:/software engineering/tomcat/apache-tomcat-8.5.37/lib/tomcat-jdbc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="tomcat-lib" level="project" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+          <root url="jar://$MODULE_DIR$/deployment/mariadb-java-client-2.3.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />