users
partners
socket fix
logs
working users?
fix
users
Merge branch 'master' of https://github.com/sbard26/virtual_couch
work

Conflicts:
	public/js/main.js
	views/testServerPage.html