Merge branch 'master' into 'dev'

# Conflicts:
#   CityDoctorParent/CityDoctorCheckResult/pom.xml
#   CityDoctorParent/CityDoctorEdge/pom.xml
#   CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/PolyLine.java
#   CityDoctorParent/CityDoctorModel/pom.xml
#   CityDoctorParent/CityDoctorValidation/pom.xml
#   CityDoctorParent/pom.xml