diff --git a/.gitignore b/.gitignore
index 41b7b150473a7564453cbfdb0cd1509c5f47816c..c7c103277a1af52911cd80028e198ed3f24bacff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
+/.idea/
+
 /settings.properties
 /target
 /deploy
-/.idea/libraries
-/.idea/dictionaries
-workspace.xml
-kotlinc.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index bb45fa24b16def29a9bbf9d9ecfd44f8aefcdf6a..0000000000000000000000000000000000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="PlayWallServer" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="PlayWallServer" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5755a998780a3352b3706bc6c89e9280257b8d39..0000000000000000000000000000000000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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" languageLevel="JDK_1_8" default="true" 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/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 769e1ce13b79e7b4fbfde68f8f653e5dd4a2f511..0000000000000000000000000000000000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/PlayWallServer.iml" filepath="$PROJECT_DIR$/PlayWallServer.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml
deleted file mode 100644
index 27a2b271081ccef5f0bf7143caa0e999412e30bc..0000000000000000000000000000000000000000
--- a/.idea/scala_compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ScalaCompilerConfiguration">
-    <profile name="Maven 1" modules="PlayWallServer" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/PlayWallServer.iml b/PlayWallServer.iml
index 7f3dfa768e820705d0294b0e6d89f9d8fe5beda7..445a0938061e8ba63891b8cb45740911b100f2cf 100644
--- a/PlayWallServer.iml
+++ b/PlayWallServer.iml
@@ -36,6 +36,8 @@
     <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-core:5.0" level="project" />
     <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file