Pull recent changes from Peter Staab
merge from ww2.5.1.3
Merge branch 'ww2.5.1.3' into mg-devel2

Conflicts:
	htdocs/themes/math3/math3.css
	lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
        Fixed
Insert instructor_set_maker_no_js into the URLPath (including as a kid of instructor_tools)
Merge branch 'mg-devel2' of git://github.com/mgage/webwork2-dev into develop
switching mathjax to a submodule
mathjax is now a submodule
Merge pull request #20 from openwebwork/release/2.6

Release/2.6
Merge pull request #23 from openwebwork/release/2.7

Merge pull request #21 from mgage/update_release_candidate
Merge branch 'hotfix/fix_version' into develop

Conflicts:
	VERSION
         Fixed
Merge branch 'ww2.5.1.3' into math4
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into math4

Conflicts:
	conf/localOverrides.conf.dist
	htdocs/js/lib/vendor/bootstrap/js/bootstrap.js
	lib/WeBWorK/ContentGenerator.pm
	lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor3.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
Merge branch 'student-past-answers' into math4 and fixing stuff from previous merge

Conflicts:
	lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
Merge branch 'classlist-tabber' into math4

Conflicts:
	htdocs/themes/math4/math4.css
	htdocs/themes/math4/math4.js
Finalizing for push to webwork develop
Merge branch 'math4' of https://github.com/goehle/webwork2 into math4

Conflicts:
	htdocs/themes/math4/math4.css
	lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
Getting sever to start
Getting things to start
Merge branch 'ww2.5.1.3' into math4

Conflicts:
	lib/WeBWorK/Authen/LDAP.pm
Fixed some formatting in the documentation of the settings in defaults.config