Added main server Model API, changed some other stuff
Merge branch 'master' of https://github.com/goldenice/UpCluster