Merge branch 'ww3-feature/calendar' into ww3-feature/wcu-ui

* ww3-feature/calendar:
  Made app_state more robust when switching branches.

Conflicts:
	webwork3/public/js/apps/CourseManager/CourseManager.js
	webwork3/public/js/views/MainViewList.js
Changed the UI for the assign/unassign subview of the problem set view.
Fixed issue where 1) user set changes were not triggering a message and 2) after fixing, they fired twice.
Added icons to the list of Views.
Tweaked the look of the icons in the menu.
Merge branch 'ww3-feature/calendar' into ww3-feature/wcu-ui

* ww3-feature/calendar:
  Another merge conflict (+1 squashed commit) Squashed commits: [91b1cf8] Fix in which setting the date by dragging onto the calendar resulted in an error.  This was because the reduced_scoring_date was not set correctly.
Switched all boolean properties to checkboxes.
Made sure that when the help was open in the problem set details that changing tabs changed the help sidebar.
Update help for Problem Set Detail View.
Merge branch 'ww3-feature/back-button' into ww3-feature/wcu-ui

* ww3-feature/back-button: (39 commits)
  Continued work on the app state.  Now the sidebar's open status is correctly saved.
  Problem List options is now saving its state in a standard way.
  A number of bug fixes and changes to saving the state of the course manager.
  A few fixes to the library browser
  Saved sidebar now reopens on page refresh
  Save the page number in the state of the library browser.
  Fixes to highlighting problems in a problem set in the library browser.
  Continued work on the state of the app.
  Changed the way the state is saved in the Settings view.
  Work on the state of the student progress view.
  Fixed a small error with ProblemSet Manager.
  Finished redoing the state for Problem Set Details.
  Redo the TabbedMainView state saving and made sure the Library Browser state saving works.
  Finished the state for Problem Set Details View.
  Serious revision of the state of the homework manager. This includes: 1. Making every view have a state field (which is a Backbone.Model).  This allows the automatic saving of the state when extending MainView. 2. Redoing of the views to make sure that they use the this.state to saving information about each view. 3. Renaming of sidepanes or option panes to sidebars for consistency.
  Cherry pick of 48b8e3e
  Initial work on saving the state of the sidebars
  Initial work on saving the state of the sidebars
  Got rid of the annoying alert popup on navigating away from the page.
  Continued work on the ProblemSetsManager and ClasslistManager views.
  ...

Conflicts:
	webwork3/public/js/apps/CourseManager/CourseManager.js
	webwork3/public/js/apps/CourseManager/config.json
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetDetailView.js
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetsManager.js
	webwork3/public/js/views/MainView.js
	webwork3/public/js/views/MainViewList.js
	webwork3/public/js/views/TabbedMainView.js
	webwork3/public/js/views/WWSettingsView.js
	webwork3/views/main/general.tt
Some changes to fix bugs introduced in the merge.
Fixed a bug in which clicking Help in the nav bar didn't work.
Merge branch 'ww3-feature/back-button' into ww3-feature/wcu-ui

* ww3-feature/back-button:
  The Problem Set Details pane problem options sidebar is now correctly saving the state.
  Fixed bug where sorting the problem set manager by date didn't give the direction arrow.
  Fixed error in which Problem Sets Detail wasn't loading correctly.
  fixed a regression where the help side pane wouldn't open.
  Fixed an error where the back/forward arrows were disabled and a bug on the class list manager.
  Problem Sets Manager and Classlist manager now saving the sort field and direction.
  More fixes with the general tab structure and state saving.
  The view name wasn't being shown in the navigation bar.
  Fixed a bug where the state wasn't being saved when clicking a HW set in the sidebar.

Conflicts:
	webwork3/public/js/apps/CourseManager/CourseManager.js
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetDetailView.js
	webwork3/public/js/views/WebPage.js
Fixed an issue where the icons were no longer showing.
Fixed an issue where the checkboxes in the problem sets manager were not consistent with the values for enable_reduced_scoring and visible.
Somehow the code for the Assign Users view was mixed up.  I pulled in some old code to fix this.
Merge branch 'ww3' of https://github.com/openwebwork/webwork2 into ww3-feature/wcu-ui
Merge branch 'ww3-feature/wcu-ui' into ww3-feature/problem-sets-manager

* ww3-feature/wcu-ui:
  Somehow the code for the Assign Users view was mixed up.  I pulled in some old code to fix this.
  Fixed an issue where the checkboxes in the problem sets manager were not consistent with the values for enable_reduced_scoring and visible.
  Fixed an issue where the icons were no longer showing.
  Fixed a bug in which clicking Help in the nav bar didn't work.
  Some changes to fix bugs introduced in the merge.
  Update help for Problem Set Detail View.
  Made sure that when the help was open in the problem set details that changing tabs changed the help sidebar.
  Switched all boolean properties to checkboxes.
  Tweaked the look of the icons in the menu.
  Added icons to the list of Views.
  Fixed issue where 1) user set changes were not triggering a message and 2) after fixing, they fired twice.
  Changed the UI for the assign/unassign subview of the problem set view.

Conflicts:
	webwork3/public/js/apps/CourseManager/main-views/ProblemSetsManager.js
	webwork3/public/js/apps/config.js
	webwork3/public/js/views/CollectionTableView.js
	webwork3/views/main/general.tt
	webwork3/views/main/problem_set_details.tt
Fixed some errors with the merge and with the select all in tables.