Implement PUT method on Server Resource endpoint so it can be updated and users/groups can be added to it.
Merge branch 'master' into server_put_method
Fixed circular import.
Merge pull request #64 from computmaxer/server_put_method

Implement PUT method on Server Resource endpoint
fix merge conflicts