Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_server_detail
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_server_detail
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_server_detail
List of users on a server
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_server_detail
Revoke access to users from a server
Merge pull request #76 from organman91/master

Adding/removing public keys
logs live updating and page rearrange
no message
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_logs

Conflicts:
	app/scripts/controllers/logs.js
	app/scripts/services/logs.js
	app/views/logs.html
resolved
Merge pull request #78 from jacobhummel/frontend_logs

Frontend logs