Merge branch 'ww2.5.1.3' of https://github.com/mgage/webwork2-dev into ww2.5.1.3
Merge branch 'math4'
Merge branch 'student-past-answers'

Conflicts:
	lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
Merge branch 'math4'

Conflicts:
	htdocs/themes/math4/math4.css
Merge branch 'ww2.5.1.3'
Merge branch 'ww2.5.1.3'
Merge branch 'master' of https://github.com/goehle/webwork2 into ww2.5.1.3
fixing conlficts with left over stuff
Merge branch 'math4' of https://github.com/goehle/webwork2 into math4

Conflicts:
	htdocs/themes/math4/math4.css
	lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm