Merge branch 'develop' into feature/jwt

# Conflicts:
#	install/1_structure.sql
#	install/upgrade/8.9.0.sql
#	install/upgrade/upgrade.md
#	openatlas/static/js/functions.js

Author: BernhardKoschicek

README.md

@@ -38,14 +38,16 @@ Please refer to our [contributing guidelines](CONTRIBUTING.md)
 
 - **Stefan Eichert** - Idea, Concept and Data Modelling
 ([stefan.eichert@nhm-wien.ac.at](mailto:stefan.eichert@nhm-wien.ac.at))
+- **Nina Richards** - Project Management and Bioarchaeological Expertise
+([nina.richards@oeaw.ac.at](mailto:nina.richards@oeaw.ac.at))
 - **Alexander Watzinger** - Lead Developer and Concept
 ([alexander.watzinger@oeaw.ac.at](mailto:alexander.watzinger@oeaw.ac.at))
 - **Bernhard Koschiček-Krombholz** - Backend Development, API
 ([bernhard.koschicek-krombholz@oeaw.ac.at](mailto:bernhard.koschicek-krombholz@oeaw.ac.at))
-- **Nina Richards** - Bioarchaeological Expertise
-([nina.richards@oeaw.ac.at](mailto:nina.richards@oeaw.ac.at))
 - **Olivia Reichl** - Frontend Development
-([Olivia.Reichl@oeaw.ac.at](mailto:Olivia.Reichl@oeaw.ac.at)
+([Olivia.Reichl@oeaw.ac.at](mailto:Olivia.Reichl@oeaw.ac.at))
+- **Katharina Wünsche** - Frontend Development
+([Katharina Wuensche@oeaw.ac.at](mailto:Katharina Wuensche@oeaw.ac.at))
 - **Jan Belik** - Logo Design and Design Consulting
 ([buero@janbelik.com](mailto:buero@janbelik.com))
 

config/default.py

@@ -3,7 +3,7 @@
 
 from config.database_versions import DATABASE_VERSIONS
 
-VERSION = '8.9.0'
+VERSION = '8.10.0'
 DATABASE_VERSION = DATABASE_VERSIONS[0]
 DEMO_MODE = False  # If activated some options are disabled, login is prefilled
 DEBUG = False