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

Fix user_group error
Merge branch 'master' of github.com:mpdavis/vinz into web

Conflicts:
	app/views/users.html
Hashtags are sneaky little buggers
Merge pull request #124 from computmaxer/#sneaky_little_hashtags

#sneaky_little_hashtags
Merge branch 'master' of github.com:mpdavis/vinz into web
Scan logs
Merge pull request #125 from mpdavis/dashboard

Scan logs
Merge branch 'master' of github.com:mpdavis/vinz into web
reverse timestamps
revert the reverse
Fixing counter
Fixing scan logs when less than 7 days of data
User Group Detail is still broken
Merge branch 'master' of github.com:mpdavis/vinz into web