Merge branch 'master' into Docker

# Conflicts:
#	konova/sub_settings/django_settings.py

konova/sub_settings/django_settings.py

@@ -70,6 +70,7 @@ INSTALLED_APPS = [
     'ema',
     'codelist',
     'analysis',
+    'api',
 ]
 if DEBUG:
     INSTALLED_APPS += [
@@ -213,6 +214,7 @@ if DEBUG:
 DEFAULT_FROM_EMAIL = "no-reply@ksp.de"  # The default email address for the 'from' element
 EMAIL_HOST = os.environ.get('SMTP_HOST'),
 EMAIL_REPLY_TO = os.environ.get('SMTP_REAL_REPLY_MAIL')
+SUPPORT_MAIL_RECIPIENT = EMAIL_REPLY_TO
 EMAIL_PORT = os.environ.get('SMTP_PORT'),
 
 # LOGGING