Added Dashboard to the users page
Merge branch 'master' of github.com:mpdavis/vinz into web
Merge branch 'master' of github.com:mpdavis/vinz into web
fixed dashboard
Started User groups
Merge branch 'master' of github.com:mpdavis/vinz into web

Conflicts:
	app/scripts/controllers/server_groups.js
Merge branch 'master' of github.com:mpdavis/vinz into web

Conflicts:
	app/views/users.html
Merge branch 'master' of github.com:mpdavis/vinz into web
Merge branch 'master' of github.com:mpdavis/vinz into web
User Group Detail is still broken
Merge branch 'master' of github.com:mpdavis/vinz into web
Merge pull request #126 from ericfeldmann/web

Web