Adds activate/deactivate user to userview.

Fully resolves #1217.
Merge branch 'userview-admin-link' into deactivate-from-userview

Conflicts:
	esp/templates/users/userview.html
Merge pull request #1227 from learning-unlimited/deactivate-from-userview

Adds activate/deactivate user to userview.