Merge remote-tracking branch 'origin/master' into user-icons

Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl

public/src/app.js

@@ -71,12 +71,14 @@ app.cacheBuster = null;
 				}
 			});
 
-			require(['taskbar', 'helpers'], function(taskbar, helpers) {
+			require(['taskbar', 'helpers', 'forum/pagination'], function(taskbar, helpers, pagination) {
 				taskbar.init();
 
 				// templates.js helpers
 				helpers.register();
 
+				pagination.init();
+
 				$(window).trigger('action:app.load');
 			});
 		});
@@ -143,14 +145,25 @@ app.cacheBuster = null;
 				'icon:text': app.user['icon:text']
 			}, function(err) {
 				if (err) {
-					app.alertError(err.message);
-					return;
+					return app.alertError(err.message);
 				}
 				app.currentRoom = room;
 			});
 		}
 	};
 
+	app.leaveCurrentRoom = function() {
+		if (!socket) {
+			return;
+		}
+		socket.emit('meta.rooms.leaveCurrent', function(err) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+			app.currentRoom = '';
+		});
+	}
+
 	function highlightNavigationLink() {
 		var path = window.location.pathname;
 		$('#main-nav li').removeClass('active');