Server relation to User change
Merge pull request #60 from computmaxer/master

Server relation to User change