ignore x509 credentials
Merge branch 'master' of github.com:slipstream/SlipStreamServer
Merge branch 'master' of github.com:slipstream/SlipStreamServer
change namespace structure; refactor organization of functions