rename namespaces to be more explicit
Merge branch 'master' of github.com:slipstream/SlipStreamServer