Merge branch 'master' into 0.7.0

Conflicts:
	src/user.js

public/src/client/groups/list.js

@@ -32,16 +32,18 @@ define('forum/groups/list', function() {
 
 		// Group searching
 		$('#search-text').on('keydown', function(e) {
-			if (e.keyCode === 13) { Groups.search(); }
+			if (e.keyCode === 13) { Groups.search(e); }
 		});
 		$('#search-button').on('click', Groups.search);
 	};
 
-	Groups.search = function() {
+	Groups.search = function(event) {
 		var groupsEl = $('#groups-list'),
 			queryEl = $('#search-text'),
 			sortEl = $('#search-sort');
 
+		event.preventDefault();
+
 		socket.emit('groups.search', {
 			query: queryEl.val(),
 			options: {

src/user.js

@@ -249,6 +249,7 @@ var	async = require('async'),
 					user.banned = parseInt(user.banned, 10) === 1;
 					user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
 				});
+
 				plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
 					if (err) {
 						return callback(err);