server changes
Merge branch 'master' of https://github.com/InfiniteCascade/heartbeat-server