save temperal changes for 3 functions
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
fix naming issue
add a space between the comma and the second paramete in fucntions
minor fix
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