Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality

Conflicts:
	src/database.js

src/middleware/admin.js

@@ -89,4 +89,4 @@ middleware.buildHeader = function(req, res, next) {
 module.exports = function(webserver) {
 	app = webserver;
 	return middleware;
-};
+};

src/middleware/index.js

@@ -217,4 +217,4 @@ module.exports = function(app, data) {
 	});
 
 	return middleware;
-};
+};

src/middleware/middleware.js

@@ -345,4 +345,4 @@ module.exports = function(webserver) {
 	middleware.admin = require('./admin')(webserver);
 
 	return middleware;
-};
+};