diff --git a/.gitignore b/.gitignore
index 68d555c..db30ca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.orig
+target/
# Compiled class file
*.class
@@ -59,6 +60,7 @@ $RECYCLE.BIN/
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
+.idea/artifacts/**
# Generated files
.idea/**/contentModel.xml
@@ -80,11 +82,11 @@ $RECYCLE.BIN/
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+ .idea/modules.xml
+ .idea/*.iml
+ .idea/modules
+ *.iml
+ *.ipr
# CMake
cmake-build-*/
@@ -202,114 +204,4 @@ Icon
.AppleDesktop
Network Trash Folder
Temporary Items
-.apdisk
-
-### Java template
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-### Windows template
-# Windows thumbnail cache files
-
-# Dump file
-
-# Folder config file
-
-# Recycle Bin used on file shares
-
-# Windows Installer files
-
-# Windows shortcuts
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-
-# Generated files
-
-# Sensitive or high-churn files
-
-# Gradle
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn. Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-
-# Mongo Explorer plugin
-
-# File-based project format
-
-# IntelliJ
-
-# mpeltonen/sbt-idea plugin
-
-# JIRA plugin
-
-# Cursive Clojure plugin
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-
-# Editor-based Rest Client
-
-# Android studio 3.1+ serialized cache file
-
-### Eclipse template
-
-# External tool builders
-
-# Locally stored "Eclipse launch configurations"
-
-# PyDev specific (Python IDE for Eclipse)
-
-# CDT-specific (C/C++ Development Tooling)
-
-# CDT- autotools
-
-# Java annotation processor (APT)
-
-# PDT-specific (PHP Development Tools)
-
-# sbteclipse plugin
-
-# Tern plugin
-
-# TeXlipse plugin
-
-# STS (Spring Tool Suite)
-
-# Code Recommenders
-
-# Annotation Processing
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-
-### Java template
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+.apdisk
\ No newline at end of file
diff --git a/.idea/artifacts/hapi_fhir_jpaserver_starter_war.xml b/.idea/artifacts/hapi_fhir_jpaserver_starter_war.xml
deleted file mode 100644
index b74c832..0000000
--- a/.idea/artifacts/hapi_fhir_jpaserver_starter_war.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- $PROJECT_DIR$/target
-
-
- hapi-fhir-jpaserver-starter
- war
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/hapi_fhir_jpaserver_starter_war_exploded.xml b/.idea/artifacts/hapi_fhir_jpaserver_starter_war_exploded.xml
deleted file mode 100644
index 936e34e..0000000
--- a/.idea/artifacts/hapi_fhir_jpaserver_starter_war_exploded.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
- $PROJECT_DIR$/target/hapi-fhir-jpaserver
-
-
- true
- hapi-fhir-jpaserver-starter
- war
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/vitu_hapi_war.xml b/.idea/artifacts/vitu_hapi_war.xml
deleted file mode 100644
index 8ac9f6e..0000000
--- a/.idea/artifacts/vitu_hapi_war.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- $PROJECT_DIR$/target
-
-
- vitu-hapi
- war
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/vitu_hapi_war_exploded.xml b/.idea/artifacts/vitu_hapi_war_exploded.xml
deleted file mode 100644
index 86c20e0..0000000
--- a/.idea/artifacts/vitu_hapi_war_exploded.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
- $PROJECT_DIR$/target/vitu-hapi
-
-
- true
- vitu-hapi
- war
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index e9feb9d..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,511 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:.*Style
-
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
-
-
- .*:layout_width
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_height
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_weight
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_margin
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginTop
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginBottom
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginStart
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginEnd
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginLeft
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_marginRight
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:layout_.*
-
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
-
-
- .*:padding
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingTop
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingBottom
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingStart
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingEnd
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingLeft
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:paddingRight
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
-
-
- .*
- http://schemas.android.com/apk/res-auto
-
-
- BY_NAME
-
-
-
-
-
-
- .*
- http://schemas.android.com/tools
-
-
- BY_NAME
-
-
-
-
-
-
- .*
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 956f943..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e79da7e..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f0c2686..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 0adeb36..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file