Merge branch 'master' of https://github.com/PhysikOnline-FFM/sagenb into sprint-1_merge
flask-error bugfix - server running now
Merge branch 'sprint-1_merge' of https://github.com/PhysikOnline-FFM/sagenb into pokal-branding_merge-svenk

# By Carsten Bauer
# Via Carsten Bauer (1) and Philip-A (1)
* 'sprint-1_merge' of https://github.com/PhysikOnline-FFM/sagenb:
  flask-error bugfix - server running now