removed server state refs
Merge branch 'master' of github.com:BenDoan/livia-server