fix tether; fix lobby api;
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	server/brain.js
	server/models/entities/tether.js