Merge branch 'master' of https://github.com/psychobunny/NodeBB

public/src/app.js

@@ -71,14 +71,18 @@ var socket,
 
 		if (params.timeout) {
 			setTimeout(function() {
-				jQuery(div).fadeOut(1000);
+				jQuery(div).fadeOut(1000, function() {
+					this.remove();
+				});
 			}, params.timeout)
 		}
 
 		if (params.clickfn) {
 			div.onclick = function() {
 				params.clickfn();
-				jQuery(div).fadeOut(500);
+				jQuery(div).fadeOut(500, function() {
+					this.remove();
+				});
 			}
 		}
 	}

src/user.js

@@ -116,7 +116,6 @@ var	config = require('../config.js'),
 				}
 				
 				User.getUserField(uid, 'password', function(user_password) {
-					
 					bcrypt.compare(password, user_password, function(err, res) {
 						if (res === true) {
 							next({