Merge branch 'refs/heads/dev' into dev_zip_files

# Conflicts:
#	CityDoctorParent/CityDoctorModel/pom.xml
#	CityDoctorParent/pom.xml
1 job for dev_gui_features_zip_loading in 1 minute and 9 seconds (queued for 1 second)