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

Conflicts:
	src/database.js

src/user/create.js

@@ -141,4 +141,4 @@ module.exports = function(User) {
 			});
 		});
 	};
-};
+};

src/user/follow.js

@@ -65,4 +65,4 @@ module.exports = function(User) {
 		db.isSetMember('following:' + uid, theirid, callback);
 	};
 
-};
+};

src/user/notifications.js

@@ -180,4 +180,4 @@ var async = require('async'),
 		});
 	};
 
-}(exports));
+}(exports));

src/user/profile.js

@@ -253,4 +253,4 @@ module.exports = function(User) {
 		}
 	};
 
-};
+};

src/user/reset.js

@@ -89,4 +89,4 @@ var async = require('async'),
 		});
 	};
 
-}(exports));
+}(exports));

src/user/search.js

@@ -41,4 +41,3 @@ module.exports = function(User) {
 		});
 	};
 };
-

src/user/settings.js

@@ -52,4 +52,4 @@ module.exports = function(User) {
 			language: data.language || meta.config.defaultLang
 		}, callback);
 	};
-};
+};