Base services
Merge branch 'master' of github.com:noelking/bigchat