Merge remote-tracking branch 'origin/Backend' into Backend

# Conflicts:
#	app.py
#	dualisauth.py

app.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3.6
-import requests
 from flask import Flask
 from flask import render_template, url_for, send_from_directory, redirect, request, send_file
 from flask_login import login_user, login_required, current_user, LoginManager, UserMixin, logout_user
@@ -63,12 +62,12 @@ def index():
 @login_required
 def welcome():
     d = Dualis.query.filter_by(uid=current_user.id).first()
-    if not d.kurs:
+    if not current_user.kurs:
         kurs = dualisauth.getKurs(d.token, d.cookie)
         current_user.kurs = kurs
         db.session.commit()
     else:
-        kurs = d.kurs
+        kurs = current_user.kurs
     name = current_user.name
     return render_template('index.html', headermessage='DualHub', message="Hallo, "
                                                                           + name + " (" + kurs + ")")

dualisauth.py

@@ -45,7 +45,7 @@ def getKurs(token: str, cookie: int):
     return kurs
 
 
-def checkLifetime(timecode):
+def checkLifetime(timecode: float):
     if time.time() - timecode > 1800:
         return False
     else: