revised Admin's view of user checklist
Revised admin's view of user checklist
Merge conflict resolution

Merge branch 'master' into todo

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #44 from aphuong/todo

Todo