Merge branch 'master' of https://github.com/janeczku/calibre-web into develop

# Conflicts:
#	cps.py

cps.py

@@ -28,6 +28,7 @@ if __name__ == '__main__':
             http_server = HTTPServer(WSGIContainer(web.app))
             http_server.listen(web.ub.config.config_port)
             IOLoop.instance().start()
+            IOLoop.instance().close(True)
 
     if web.helper.global_task == 0:
         web.app.logger.info("Performing restart of Calibre-web")