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

public/templates/category.tpl

@@ -48,7 +48,7 @@
 					<div>
 						<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
 						<small>
-							<strong><i class="{topics.pin-icon}"></i><i class="{topics.lock-icon}"></i></strong>
+							<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
 							Posted {topics.relativeTime} ago by
 							<strong>{topics.username}</strong>.
 						</small>

src/user.js

@@ -772,7 +772,7 @@ var utils = require('./../public/src/utils.js'),
 	User.isAdministrator = function(uid, callback) {
 		Groups.getGidFromName('Administrators', function(err, gid) {
 			Groups.isMember(uid, gid, function(err, isAdmin) {
-				callback(isAdmin);
+				callback(!!isAdmin);
 			});
 		});
 	}