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

# Conflicts:
#	.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
#	src/dao/DBManagement.java

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,19 +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 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>
-  </artifact>
-</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>