merge
merge
changed serverstub functions to server calls
changed serverstub functions to server calls
Merge branch 'master' of https://github.com/algovik/cloaked-octo-robot