server updates lol
Merge branch 'master' of github.com:chatterHub/chatter
large update. server almost functional.