work in progress
Merge branch 'master' of https://github.com/nkashyap/console.io

Conflicts:
	app/controller/device/console.js
	server/user.js