moving back to desktop
Merge branch 'master' of github.com:adminion/adminion

Conflicts:
	lib/realtime.js
	models/socket.js