Merge branch 'master' into wtforms

Conflicts:
	app/main.py

app/main.py

@@ -11,13 +11,13 @@ from functools import wraps
 from flask_wtf import Form
 from wtforms import DateField, IntegerField, DecimalField
 from wtforms.validators import DataRequired, ValidationError
+import os
 
 app = Flask(__name__)
 DATABASE = '/data/rollerverbrauch.db'
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///'+DATABASE
 sqldb = SQLAlchemy(app)
 
-DEBUG = True
 SECRET_KEY = 'development key'
 app.config.from_object(__name__)
 
@@ -221,4 +221,5 @@ def prepare_pit_stops(pss):
     return pitstops
 
 if __name__ == '__main__':
-    app.run(debug=True, host='0.0.0.0')
+    DEBUG = 'DEBUG' in os.environ and os.environ['DEBUG'] != 'False'
+    app.run(debug=DEBUG, host='0.0.0.0')