server common, manifest cleanup
Merge branch 'master' of github.com:joshblum/fakeblock
debug
merge