Make users with makeroom permission able to ignore modjoin

A user that is capable of creating a private room (ie. a leader)
should be able to join a modjoined room anyway.

users.js

@@ -1329,16 +1329,16 @@ User = (function () {
 				return false;
 			}
 		}
-		var bypassAll = this.can('bypassall');
-		if (room.tour && !bypassAll) {
+		var makeRoom = this.can('makeroom');
+		if (room.tour && !makeRoom) {
 			var tour = room.tour.tour;
 			var errorMessage = tour.onBattleJoin(room, this);
 			if (errorMessage) {
 				connection.sendTo(roomid, "|noinit|joinfailed|" + errorMessage);
 				return false;
 			}
 		}
-		if (room.modjoin && !bypassAll) {
+		if (room.modjoin && !makeRoom) {
 			var userGroup = this.group;
 			if (room.auth) {
 				if (room.isPrivate === true) {