Merge branch 'johni/quick-mode' into develop

This commit is contained in:
Jonas Herzig
2018-12-19 10:12:23 +01:00
8 changed files with 2511 additions and 1148 deletions