Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev into ww2.5.2
moving around javascript files and breaking things
Start on moving to amd javascript
Initial code for a Homework Set Editor 3.
removing local dists.
Merge commit '7c6c4d299e58735206d213c93b5e6bc6e05ed69d'

Conflicts:
	conf/defaults.config
	conf/localOverrides.conf.dist
	conf/templates/dgage/lbtwo.template
	conf/templates/math/lbtwo.template
	conf/templates/math2/lbtwo.template
	conf/templates/ur/lbtwo.template
	lib/WeBWorK/ContentGenerator/Instructor/UserList3.pm
	lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm
Merge commit '1a2b82599047004142989fa47e8a0b53b44a4e88' into requirejs

Conflicts:
	htdocs/js/lib/webwork/WeBWorK.js
	htdocs/js/lib/webwork/teacher/User.js
Added ProblemSet.js and ProblemSetList.pm
Merge commit '1c30b8e602670981c506a1e0f20327f239d11222' into requirejs
update to get things working
A start with requirejs
Merge branch 'ww2.5.2' of https://github.com/openwebwork/webwork2-dev into ww2.5.2
Bug fixes to the Hwk Editor 3
requirejs working for library browser 3
Merge commit '7fd5268e1bf64c7cf25b1faf9fb27a95b5901c3c' into requirejs

Conflicts:
	htdocs/js/lib/webwork/WeBWorK.js
Use Storable::nfreeze instead of freeze.
This fixes abug discussed in http://webwork.maa.org/moodle/mod/forum/discuss.php?d=2562
userlist3 working with requires
Merge pull request #61 from apizer/ww2.5.2

Use Storable::nfreeze instead of freeze.
removed base url, turns out it breaks things
More bug fixes and features for Homework Set Editor.