server renaming
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	client/js/entities/tether_node.js