Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master

src/login.js

@@ -1,5 +1,5 @@
 var user = require('./user'),
-	bcrypt = require('bcrypt'),
+	bcrypt = require('bcryptjs'),
 	db = require('./database'),
 	path = require('path'),
 	winston = require('winston'),