Update dashboard
- Can add a new user, edit and remove
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	assets/javascripts/ui.coffee