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

src/socket.io/index.js

@@ -3,7 +3,6 @@
 var	SocketIO = require('socket.io'),
 	socketioWildcard = require('socketio-wildcard')(),
 	async = require('async'),
-	fs = require('fs'),
 	nconf = require('nconf'),
 	cookieParser = require('cookie-parser')(nconf.get('secret')),
 	winston = require('winston'),