Fixed some formatting in the documentation of the settings in defaults.config
Continued work to reorganize htdocs/js folder.
Polish to the Homework Manager
Continued work on the SimplePGEditor
Fixed the navigation bar to make it fit better.
Homework Manager: Fixed an error upon showing the "too many overlapping assignments" on the calendar.
Continued refinement and clean up of Homework Mananger.
Finished moving files around in js directory.
Fixed issue #34 (from webwork2-dev) about not assigning to users.
Made a minor change (deleted a console.log statement) to make a pull request.
Merge pull request #25 from goehle/ww2.5.1.3

Essay problem tweaks
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop

Conflicts:
	htdocs/js/setmaker.js
	lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
	lib/WeBWorK/ContentGenerator/Problem.pm
Merge pull request #34 from mgage/develop

Develop
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop

Conflicts:
	lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor3.pm
	lib/WeBWorK/ContentGenerator/Instructor/UserList2.pm
Added key=>1 to fields in PastAnswer, and did some other little bugfixes.
Not sure why mathjax is changed...
Merge branch 'math4'
Merge branch 'develop' of https://github.com/openwebwork/webwork2
Merge pull request #27 from pstaabp/develop

Develop
Made past_answers native and added more keys to improve load times
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into math4
Merge branch 'fresh2.7' into math4

Conflicts:
	lib/WeBWorK/DB/Record/PastAnswer.pm
Merge branch 'math4'