uploading files working
Direct messaging enabled
files added
Merge remote-tracking branch 'origin/FixedFileUpload'

Conflicts:
	client/app/js/controllers/user.js
	client/app/partials/groups/_privatechat.html
	client/app/partials/groups/_privatechat.jade
	server/boot/sockets.js