save temperal changes for 3 functions
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Implement PUT method on Server Resource endpoint so it can be updated and users/groups can be added to it.
Merge remote-tracking branch 'upstream/master'
add user group and server group with basic functions
fix line ending
simplify get_users and get_servers function in models
Merge branch 'master' into server_put_method
Fixed circular import.
fix naming issue
Merge pull request #64 from computmaxer/server_put_method

Implement PUT method on Server Resource endpoint
add a space between the comma and the second paramete in fucntions
minor fix
Merge pull request #67 from jacobhummel/frontend_server_detail

Frontend server detail
fix merge conflicts
Merge branch 'master' of https://github.com/mpdavis/vinz
Merge pull request #68 from qinxiaoapp/master

Add user group and server group
Fix build error with bootstrap command.
Merge pull request #69 from computmaxer/master

Fix build error with bootstrap command.