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
Merge pull request #69 from computmaxer/master

Fix build error with bootstrap command.
Adding DEV_SERVERS and DEV_USERS to manage.py
Merge branch 'master' of gh-personal:mpdavis/vinz
Adding server users endpoint for Jacob
fixing typo get_usernames() --> get_users()
Merge pull request #70 from computmaxer/server_users_endpoint

Adding server users endpoint for Jacob
Adding method to get user by username