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

# Conflicts:
#	src/core/process/C_CollegeFillScoreOpinion.java
#	src/core/process/C_MentorFillOpeningReportOpinion.java
#	src/core/process/ProcessManagement.java

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,11 +1,17 @@
 <component name="ArtifactManager">
-  <artifact type="exploded-war" name="gdms:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/gdms_war_exploded</output-path>
+  <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="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 id="module-output" name="GDMS" />
+          <element id="dir-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="lib" />
+          <element id="extracted-dir" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" path-in-jar="/" />
+          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
         </element>
       </element>
     </root>