Direct messaging feature added
Merge branch 'SocketCreation'

Conflicts:
	client/app/js/appPc.js
	client/app/js/config.js
	client/app/js/controllers/admin.js
	client/app/js/controllers/index.js
	client/app/js/services/common.js
	client/app/js/services/popup.js
	client/app/partials/admin/_settings.html
	client/app/partials/admin/_settings.jade
	client/app/partials/home/_home-pc.html
	client/app/partials/home/_home-pc.jade
	client/app/templates/_uploadPopup.jade
	common/models/ticket.json
	common/models/user.js
	server/boot/upload-local.js