to work
Merge branch 'dev' of https://github.com/ozantunca/mongoadm into dev

Conflicts:
	server/environment.js
	server/lib/PersonalSockets.js