Correct link addresses for .js and .css files
Merge branch 'release/2.7' of https://github.com/mgage/webwork2 into release/2.7

Conflicts:
	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm