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

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml

.idea/dataSources/d0989a90-3d64-4aea-93d3-6e27652a2f33/storage_v2/_src_/schema/gdms.Q1cwAA.meta

@@ -0,0 +1 @@
+#n:gdms

.idea/libraries/mariadb_java_client_2_3_0.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="mariadb-java-client-2.3.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/deployment/mariadb-java-client-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

web/web/WEB-INF/web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>