more dead code
Merge branch 'master' of github.com:FamousInternal/famous-inspector

Conflicts:
	server/FamousParasite.js