Merge remote-tracking branch 'remotes/origin/development' into 2624_sormas-to-sormas-rest-endpoints

# Conflicts:
#	sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java
#	sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java
#	sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/Contact.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDtoHelper.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/LocationDialog.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/event/eventparticipant/read/EventParticipantReadFragment.java
#	sormas-app/app/src/main/java/de/symeda/sormas/app/person/read/PersonReadFragment.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/contact/Contact.java
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: lgal

.gitignore

@@ -23,6 +23,10 @@ deploy
 /sormas-app/java_pid21052.hprof
 bin
 /sormas-base/setup/setup.log
+
+# Exclude maven wrapper
+!/.mvn/wrapper/maven-wrapper.jar
+
 /sormas-cargoserver/.env
 /sormas-cargoserver/custom.env
 /sormas-cargoserver/custom.properties

.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar