Small bugfixes from code churn (moved templates / missing imports)
Merge branch 'central_server_stats' into IDOC_demo