making progress on socket cache
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	models/socket.js