Merge branch 'master' into editor

ref-test/app/__init__.py

@@ -1,9 +1,7 @@
 from .config import Development as Config
 from .install import install_app
-from .models import Entry, Dataset, Test, User
+from .models import User
 from .extensions import bootstrap, csrf, db, login_manager, mail
-from .tools.data import save
-from .tools.logs import write
 
 from flask import flash, Flask, render_template, request
 from flask.helpers import url_for
@@ -11,7 +9,6 @@ from flask.json import jsonify
 from flask_wtf.csrf import CSRFError
 from werkzeug.middleware.proxy_fix import ProxyFix
 
-from cryptography.fernet import Fernet
 from datetime import datetime
 
 def create_app():

ref-test/app/install.py

@@ -24,6 +24,7 @@ def install_app(app):
         if not database_exists(database_uri):       
             create_database(database_uri)
             write('system.log', 'No database found. Creating a new database.')
+            from .models import Entry, Dataset, Test, User
             db.create_all()
             write('system.log', 'Creating database schema.')
         if not path.isfile(f'./{data}/.encryption.key'):