Deleting file (accidentally added in a recent merge).
Fixing merge with devel branch.
Merge pull request #86 from jwj61/devel

Devel
removing local config that I screwed up
added apache-config to ignore list
Addition of features (hide, refresh, …) to Problems in Library Browser.
Merge branch 'devel' of https://github.com/mgage/webwork2-dev

Conflicts:
	conf/defaults.config
	lib/WeBWorK/URLPath.pm
reorganization of the htdocs/js folder
removing .gitignore from repository.
Trying to get Setmaker.pm working again after merge.
Continued organization  of the htdocs/js directory
Fixed the path for the js paths in Classlist Manager
Finished the reorganization of the htdocs/js folder.
Reorganized the Homework Manager to make it simpler to use.
A few UI polishes as well.
Fixed an error with the breadcrumbs on the page top.
Merge branch 'master' of https://github.com/pstaabp/webwork2-dev

Conflicts:
	VERSION
updating defaults.config to include the homework manager page.
Merge branch 'master' of https://github.com/openwebwork/webwork2

Conflicts:
	.gitignore
	VERSION
	conf/defaults.config
	conf/localOverrides.conf.dist
	conf/site.conf.dist
	htdocs/js/lib/delete-me/bootstrap/js/bootstrap.js
	htdocs/themes/math3/math3.css
	lib/WeBWorK/Constants.pm
	lib/WeBWorK/ContentGenerator.pm
	lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
	lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor3.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm
	lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
	lib/WeBWorK/ContentGenerator/Instructor/UserList2.pm
	lib/WeBWorK/ContentGenerator/Problem.pm
	lib/WebworkWebservice/SetActions.pm
Merge branch 'master' of https://github.com/openwebwork/webwork2
Trying to merge openwebwork/master
Merge branch 'master' of https://github.com/openwebwork/webwork2

# By Geoff Goehle (209) and others
# Via Geoff Goehle (104) and others
* 'master' of https://github.com/openwebwork/webwork2: (418 commits)
  Limit default Options
  Update default_achievements.axp
  Added missing file
  Remove duplicate return in ProblemGrader.pm
  Added js line to make tooltips work in math3 (used for set descriptions)
  Removed extra file
  Changed the way that teh score/status field is displayed to users to make it more user friendly.
  Fixed a small bug having to do with conditional release Fixed a small bug having to do with formatting certain forms
  Fixed issue with titles looking bad on statistics/student progress page.
  Comment out console.log which may cause trouble with IE
  Update change_of_variables.at
  Update by_definition.at
  Update blankachievement.at
  Update add_anything.at
  Update complete_150_problems.at
  Update complete_100_problems.at
  Update complete_50_problems.at
  Update complete_25_problems.at
  Update complete_10_problems.at
  Update complete_one_problem.at
  ...

Conflicts:
	.gitignore
	VERSION
	conf/defaults.config
	conf/localOverrides.conf.dist
	conf/site.conf.dist
	htdocs/css/webwork.css
	htdocs/html-templates/homework-manager.html
	htdocs/js/apps/ClasslistManager/classlistManager.js
	htdocs/js/apps/FrontPage/FrontPage.js
	htdocs/js/apps/HomeworkManager/HomeworkManager.js
	htdocs/js/apps/HomeworkManager/LibraryBrowser.js
	htdocs/js/apps/LibraryBrowser/LibraryBrowser.js
	htdocs/js/apps/LibraryBrowser/Problem.js
	htdocs/js/apps/LibraryBrowser/ProblemList.js
	htdocs/js/apps/LibraryBrowser/Set.js
	htdocs/js/apps/LibraryBrowser/SetList.js
	htdocs/js/apps/LibraryBrowser/WeBWorK.js
	htdocs/js/apps/LibraryBrowser/library_browser.js
	htdocs/js/apps/PGEditor/SimpleEditor.js
	htdocs/js/delete-me/gateway.js
	htdocs/js/delete-me/ww_applet_support.js
	htdocs/js/knowl.js
	htdocs/js/legacy/java_init.js
	htdocs/js/legacy/setmaker.js
	htdocs/js/legacy/vendor/FontAwesome/css/font-awesome.css
	htdocs/js/legacy/vendor/FontAwesome/font/fontawesome-webfont.eot
	htdocs/js/legacy/vendor/FontAwesome/font/fontawesome-webfont.svg
	htdocs/js/legacy/vendor/FontAwesome/font/fontawesome-webfont.svgz
	htdocs/js/legacy/vendor/FontAwesome/font/fontawesome-webfont.ttf
	htdocs/js/legacy/vendor/FontAwesome/font/fontawesome-webfont.woff
	htdocs/js/legacy/vendor/knowl.js
	htdocs/js/legacy/webwork_js_develop/ProblemList.js
	htdocs/js/legacy/webwork_js_develop/Set.js
	htdocs/js/legacy/webwork_js_develop/WeBWorK.js
	htdocs/js/legacy/webwork_js_develop/models/Set.js
	htdocs/js/legacy/webwork_js_develop/models/SetList.js
	htdocs/js/lib/delete-me/FontAwesome/css/font-awesome.css
	htdocs/js/lib/delete-me/FontAwesome/font/fontawesome-webfont.eot
	htdocs/js/lib/delete-me/FontAwesome/font/fontawesome-webfont.svg
	htdocs/js/lib/delete-me/FontAwesome/font/fontawesome-webfont.svgz
	htdocs/js/lib/delete-me/FontAwesome/font/fontawesome-webfont.ttf
	htdocs/js/lib/delete-me/FontAwesome/font/fontawesome-webfont.woff
	htdocs/js/lib/delete-me/backbone/docs/images/background.png
	htdocs/js/lib/delete-me/backbone/test/vendor/jquery-1.7.1.js
	htdocs/js/lib/delete-me/requirejs/tests/jquery/scripts/jquery-1.7.1.js
	htdocs/js/lib/delete-me/underscore/docs/images/background.png
	htdocs/js/lib/models/LibraryTree.js
	htdocs/js/lib/models/Problem.js
	htdocs/js/lib/models/ProblemList.js
	htdocs/js/lib/models/ProblemSet.js
	htdocs/js/lib/vendor/FontAwesome/css/font-awesome.css
	htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.eot
	htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svg
	htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svgz
	htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.ttf
	htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.woff
	htdocs/js/lib/vendor/requirejs/tests/jquery/scripts/jquery-1.7.1.js
	htdocs/js/lib/vendor/underscore/docs/images/background.png
	htdocs/js/lib/views/CalendarView.js
	htdocs/js/lib/views/Closeable.js
	htdocs/js/lib/views/LibraryTreeView.js
	htdocs/js/lib/views/LibraryView.js
	htdocs/js/lib/views/ProblemListView.js
	htdocs/js/lib/views/ProblemView.js
	htdocs/js/lib/views/WebPage.js
	htdocs/js/lib/webwork/ProblemList.js
	htdocs/js/lib/webwork/Set.js
	htdocs/js/lib/webwork/SetList.js
	htdocs/js/lib/webwork/WeBWorK.js
	htdocs/js/lib/webwork/models/Set.js
	htdocs/js/lib/webwork/models/SetList.js
	htdocs/js/vendor/bootstrap/css/bootstrap.css
	htdocs/js/vendor/bootstrap/css/bootstrap.min.css
	htdocs/js/vendor/bootstrap/js/bootstrap.js
	htdocs/js/vendor/jquery/jquery.js
	htdocs/js/vendor/other/knowl.js
	htdocs/mathjax
	htdocs/themes/math3/lbtwo.template
	htdocs/themes/math3/math3.css
	lib/WeBWorK/Constants.pm
	lib/WeBWorK/ContentGenerator.pm
	lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
	lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor3.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList3.pm
	lib/WeBWorK/ContentGenerator/Problem.pm
	lib/WeBWorK/URLPath.pm
	lib/WebworkWebservice/SetActions.pm