Merge branch 'ww3' of https://github.com/openwebwork/webwork2 into ww3-feature/login-status
Merge branch 'ww3' of https://github.com/openwebwork/webwork2 into ww3-feature/problem-sets-manager

Conflicts:
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetsManager.js
Made the login status a separate column in the class list manager.
made the logged in status functional on the class list manager view.
Turned off the ability to sort the class list manager by email.
Classlist manager: disabled the link for the email for an empty email address.
Improved the rendering speed of the problem sets manager and class list manager tables.
Fixed a bug in which the selected_sets property of the state was not rendering correctly.
Merge branch 'ww3-feature/login-status' into testing/ww3-upstream

* ww3-feature/login-status:
  Classlist manager: disabled the link for the email for an empty email address.
  Turned off the ability to sort the class list manager by email.
  made the logged in status functional on the class list manager view.
  Made the login status a separate column in the class list manager.
Merge branch 'ww3-feature/problem-sets-manager' into testing/ww3-upstream

* ww3-feature/problem-sets-manager:
  Fixed a bug in which the selected_sets property of the state was not rendering correctly.
  Improved the rendering speed of the problem sets manager and class list manager tables.

Conflicts:
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetsManager.js