From 7f15d9c0b704f959f7aead4bf0ef01264e9ef08b Mon Sep 17 00:00:00 2001
From: richard937 <papuncharan@gmail.com>
Date: Sat, 23 May 2020 11:16:41 +0530
Subject: [PATCH] solved issue #125

---
 .idea/compiler.xml                            |   1 -
 .idea/libraries/Maven__antlr_antlr_2_7_6.xml  |  13 +
 .idea/libraries/Maven__asm_asm_3_1.xml        |  13 +
 .idea/libraries/Maven__cglib_cglib_2_2.xml    |  13 +
 ...om_google_protobuf_protobuf_java_3_6_1.xml |  13 +
 .../Maven__com_metamug_mtg_api_1_6.xml        |  13 +
 ...ns_collections_commons_collections_3_1.xml |  13 +
 .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml  |  13 +
 .../Maven__javassist_javassist_3_12_0_GA.xml  |  13 +
 .../Maven__javax_transaction_jta_1_1.xml      |  13 +
 ...ven__mysql_mysql_connector_java_8_0_17.xml |  13 +
 ...ernate_commons_annotations_3_2_0_Final.xml |  13 +
 ...g_hibernate_hibernate_core_3_6_0_Final.xml |  13 +
 ...te_hibernate_entitymanager_3_6_0_Final.xml |  13 +
 ...ernate_hibernate_validator_4_1_0_Final.xml |  13 +
 ...ence_hibernate_jpa_2_0_api_1_0_0_Final.xml |  13 +
 ...ence_hibernate_jpa_2_1_api_1_0_0_Final.xml |  13 +
 .../Maven__org_slf4j_slf4j_api_1_6_1.xml      |  13 +
 .idea/misc.xml                                |   9 +-
 .idea/workspace.xml                           | 298 +++++++++++++-----
 mason.iml                                     |  58 ++++
 .../mason/service/UploaderService.java        |   6 +-
 22 files changed, 503 insertions(+), 90 deletions(-)
 create mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_6.xml
 create mode 100644 .idea/libraries/Maven__asm_asm_3_1.xml
 create mode 100644 .idea/libraries/Maven__cglib_cglib_2_2.xml
 create mode 100644 .idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml
 create mode 100644 .idea/libraries/Maven__com_metamug_mtg_api_1_6.xml
 create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_1.xml
 create mode 100644 .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
 create mode 100644 .idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml
 create mode 100644 .idea/libraries/Maven__javax_transaction_jta_1_1.xml
 create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_validator_4_1_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
 create mode 100644 mason.iml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 80664760..2b795825 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,6 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="mason" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_6.xml b/.idea/libraries/Maven__antlr_antlr_2_7_6.xml
new file mode 100644
index 00000000..c8d18a73
--- /dev/null
+++ b/.idea/libraries/Maven__antlr_antlr_2_7_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: antlr:antlr:2.7.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml
new file mode 100644
index 00000000..3386f109
--- /dev/null
+++ b/.idea/libraries/Maven__asm_asm_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: asm:asm:3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cglib_cglib_2_2.xml b/.idea/libraries/Maven__cglib_cglib_2_2.xml
new file mode 100644
index 00000000..01d9b10a
--- /dev/null
+++ b/.idea/libraries/Maven__cglib_cglib_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cglib:cglib:2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/2.2/cglib-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/2.2/cglib-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/2.2/cglib-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml
new file mode 100644
index 00000000..233670dd
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.protobuf:protobuf-java:3.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_metamug_mtg_api_1_6.xml b/.idea/libraries/Maven__com_metamug_mtg_api_1_6.xml
new file mode 100644
index 00000000..ad466da4
--- /dev/null
+++ b/.idea/libraries/Maven__com_metamug_mtg_api_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.metamug:mtg-api:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/metamug/mtg-api/1.6/mtg-api-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/metamug/mtg-api/1.6/mtg-api-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/metamug/mtg-api/1.6/mtg-api-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml
new file mode 100644
index 00000000..01dd005c
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
new file mode 100644
index 00000000..14681ee8
--- /dev/null
+++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml b/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml
new file mode 100644
index 00000000..05eb56af
--- /dev/null
+++ b/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javassist:javassist:3.12.0.GA">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.12.0.GA/javassist-3.12.0.GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.12.0.GA/javassist-3.12.0.GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.12.0.GA/javassist-3.12.0.GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
new file mode 100644
index 00000000..30472437
--- /dev/null
+++ b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.transaction:jta:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml
new file mode 100644
index 00000000..a84c3cff
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-java:8.0.17">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.17/mysql-connector-java-8.0.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.17/mysql-connector-java-8.0.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.17/mysql-connector-java-8.0.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml
new file mode 100644
index 00000000..dbb890ef
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml
new file mode 100644
index 00000000..ba3f118a
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-core:3.6.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.6.0.Final/hibernate-core-3.6.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.6.0.Final/hibernate-core-3.6.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/3.6.0.Final/hibernate-core-3.6.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml
new file mode 100644
index 00000000..6715eeb6
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-entitymanager:3.6.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/3.6.0.Final/hibernate-entitymanager-3.6.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/3.6.0.Final/hibernate-entitymanager-3.6.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/3.6.0.Final/hibernate-entitymanager-3.6.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_1_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_1_0_Final.xml
new file mode 100644
index 00000000..2d371429
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_1_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-validator:4.1.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/4.1.0.Final/hibernate-validator-4.1.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/4.1.0.Final/hibernate-validator-4.1.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/4.1.0.Final/hibernate-validator-4.1.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml
new file mode 100644
index 00000000..6b42b8a5
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
new file mode 100644
index 00000000..6492b2b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
new file mode 100644
index 00000000..38036e9f
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 83cbf518..8ed5f34d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8.0_161" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e49eaf3b..c44007aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,83 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1caabcb6-9198-4883-b8b9-c5dff813bd33" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/Router.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/Router.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/SimpleCORSFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/SimpleCORSFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/dao/AuthDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/dao/AuthDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/ContextMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/ContextMap.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/RootResource.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/RootResource.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/auth/JWebToken.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/auth/JWebToken.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/FormStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/FormStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/HtmlStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/HtmlStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/ImmutableRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/ImmutableRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/JsonStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/JsonStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/MultipartFormStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/MultipartFormStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/ParamExtractStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/ParamExtractStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/RequestAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/RequestAdapter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ClientErrorResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ClientErrorResponse.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DatasetOutput.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DatasetOutput.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DbLoggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DbLoggable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DefaultDbLogger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/DefaultDbLogger.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ErrorResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ErrorResponse.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/FileOutput.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/FileOutput.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/InternalServerErrorResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/InternalServerErrorResponse.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/JSONOutput.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/JSONOutput.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/MasonOutput.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/MasonOutput.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ResponeBuilder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/ResponeBuilder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/XMLOutput.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/response/XMLOutput.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/xrequest/XResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/xrequest/XResponse.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/exception/MasonError.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/exception/MasonError.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/exception/MasonException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/exception/MasonException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/function/Extract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/function/Extract.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/io/mpath/MPathUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/io/mpath/MPathUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/io/objectreturn/ObjectReturn.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/io/objectreturn/ObjectReturn.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/AuthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/AuthService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/ConnectionProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/ConnectionProvider.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/QueryManagerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/QueryManagerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/UploaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/UploaderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/XRequestService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/service/XRequestService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ExceptionTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ExceptionTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ExecuteTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ExecuteTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/HeaderTag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/HeaderTag.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/KeyValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/KeyValue.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ParamTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ParamTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RequestTag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RequestTag.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RequestTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RequestTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ResourceTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ResourceTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RestTag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/RestTag.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ScriptTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/ScriptTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/BodyTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/BodyTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/ParamTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/ParamTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/XRequestTagHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/metamug/mason/tag/xrequest/XRequestTagHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/META-INF/mtg-mason.tld" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/META-INF/mtg-mason.tld" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/RouterTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/RouterTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/RootResourceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/RootResourceTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/auth/JWebTokenTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/auth/JWebTokenTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/response/MasonOutputTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/entity/response/MasonOutputTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/CollectTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/CollectTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/MPathFetchValueTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/MPathFetchValueTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/MPathUnflattenTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/MPathUnflattenTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/TestData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/mpath/TestData.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/ObjectReturnTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/ObjectReturnTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/testclasses/Customer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/testclasses/Customer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/testclasses/PhoneNumber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/io/objectreturn/testclasses/PhoneNumber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/Contact.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/Contact.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/Customer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/Customer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/RequestExample.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/RequestExample.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/ResponseExample.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/ResponseExample.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/ResultExample.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/processables/ResultExample.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/QueryManagerServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/QueryManagerServiceTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestErrorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestErrorTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestHeaderTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestHeaderTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/service/xrequest/XRequestTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/metamug/mason/tag/TagHandlerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/metamug/mason/tag/TagHandlerTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/resources/test.groovy" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/resources/test.groovy" afterDir="false" />
-    </list>
+    <list default="true" id="a5942654-3ddc-416f-9a06-8c5ad92c3f32" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -86,6 +10,32 @@
   <component name="CoverageViewManager">
     <option name="myElementSize" value="99" />
   </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/metamug/mason/entity/request/RequestAdapter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="532">
+              <caret line="29" selection-start-line="29" selection-end-line="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/metamug/mason/service/UploaderService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="321">
+              <caret line="612" column="66" selection-start-line="612" selection-start-column="66" selection-end-line="612" selection-end-column="66" />
+              <folding>
+                <element signature="e#29295#29296#0" expanded="true" />
+                <element signature="e#29341#29342#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -94,12 +44,12 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
         <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IgnoredFileRootStore">
     <option name="generatedRoots">
@@ -109,6 +59,106 @@
     </option>
   </component>
   <component name="ProjectId" id="1Sj7L9KInl1X2KJ6kzjgZFZ9SLs" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mason" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mason" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+    </panes>
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showExcludedFiles" value="true" />
@@ -129,6 +179,18 @@
       <command value="mvn clean test" />
     </option>
   </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
   <component name="RunManager">
     <configuration name="All in mason" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="mason" />
@@ -179,18 +241,98 @@
     <option name="localTasksCounter" value="4" />
     <servers />
   </component>
+  <component name="ToolWindowManager">
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2147651" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Designer" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.18696883" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50067115" side_tool="true" weight="0.17988668" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
+      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.49932885" weight="0.101983" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.24966443" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Theme Preview" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Maven" order="7" weight="0.020134227" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23020135" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Designer" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50067115" side_tool="true" weight="0.17988668" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
+      <window_info active="true" anchor="bottom" id="Messages" order="10" sideWeight="0.49932885" visible="true" weight="0.04249292" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.24966443" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Theme Preview" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Maven" order="7" weight="0.020134227" />
+    </layout-to-restore>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
           <value>
             <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
               <option name="COLUMN_ORDER" />
             </State>
           </value>
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Updated ConnectionProvider" />
diff --git a/mason.iml b/mason.iml
new file mode 100644
index 00000000..c76fd947
--- /dev/null
+++ b/mason.iml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.4.15" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ivy:ivy:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.17" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20180813" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wnameless.json:json-flattener:0.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.eclipsesource.minimal-json:minimal-json:0.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wnameless.json:json-base:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.moxy:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.core:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.asm:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:3.6.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.6.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.1" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:2.2" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
+    <orderEntry type="library" name="Maven: javassist:javassist:3.12.0.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:4.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.metamug:mtg-api:1.6" level="project" />
+    <orderEntry type="library" name="Maven: javax:javaee-web-api:8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/com/metamug/mason/service/UploaderService.java b/src/main/java/com/metamug/mason/service/UploaderService.java
index d65bb29b..61fcfa68 100644
--- a/src/main/java/com/metamug/mason/service/UploaderService.java
+++ b/src/main/java/com/metamug/mason/service/UploaderService.java
@@ -606,8 +606,8 @@ private void callUploadEvent(File uploadedFile, String listenerClass, Request re
 
     private void uploadPart(HttpServletRequest request, String listenerClass) throws Exception {
         try {
-            String uploadFilePath = System.getProperty("catalina.base") + File.separator + UPLOAD_DIR + request.getContextPath();
-            Files.createDirectories(Paths.get(uploadFilePath));
+            String uploadFileLocation = System.getProperty("catalina.base") + File.separator + UPLOAD_DIR + request.getContextPath();
+            Files.createDirectories(Paths.get(uploadFileLocation));
 
             //Get all the parts from request and write it to the file on server
             // Retrieves <input type="file" name="file" multiple="true">
@@ -617,7 +617,7 @@ private void uploadPart(HttpServletRequest request, String listenerClass) throws
             String fileName;
             for (Part filePart : fileParts) { //for multiple files
                 fileName = Paths.get(filePart.getSubmittedFileName()).getFileName().toString(); // MSIE fix.
-                File uploadedFile = new File(uploadFilePath + File.separator + filePart.getSubmittedFileName());
+                File uploadedFile = new File(uploadFileLocation + File.separator + filePart.getSubmittedFileName());
                 if (!uploadedFile.isDirectory()) {
                     try (FileOutputStream fos = new FileOutputStream(uploadedFile); InputStream fileContent = filePart.getInputStream()) {
                         int read;