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

app.js

@@ -143,7 +143,8 @@
 			file: __dirname + '/config.json'
 		});
 
-		var install = require('./src/install');
+		var templates = require('./public/src/templates'),
+			install = require('./src/install');
 
 		winston.info('Welcome to NodeBB!');
 		winston.info('This looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');

src/user.js

@@ -103,7 +103,7 @@ var bcrypt = require('bcrypt'),
 
 				if (email !== undefined) {
 					db.setObjectField('email:uid', email, uid);
-					User.email.verify(uid, email);
+					if (uid !== 1) User.email.verify(uid, email);
 				}
 
 				plugins.fireHook('action:user.create', {uid: uid, username: username, email: email, picture: gravatar, timestamp: timestamp});