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

public/src/templates.js

@@ -378,7 +378,7 @@
 						checkConditional(namespace + d, data[d]);
 						checkConditional('!' + namespace + d, !data[d]);
 
-						if (blockInfo) {
+						if (blockInfo && blockInfo.iterator) {
 							checkConditional('@first', blockInfo.iterator === 0);
 							checkConditional('!@first', blockInfo.iterator !== 0);
 							checkConditional('@last', blockInfo.iterator === blockInfo.total);

src/upgrade.js

@@ -306,6 +306,11 @@ Upgrade.upgrade = function(callback) {
 				updatesMade = true;
 
 				Groups.getByGroupName('Administrators', {}, function(err, groupObj) {
+					if (err && err.message === 'gid-not-found') {
+						winston.info('[2014/1/23] Updating Administrators Group -- skipped');
+						return next();
+					}
+
 					Groups.update(groupObj.gid, {
 						name: 'administrators',
 						hidden: '1'