Deleting file (accidentally added in a recent merge).
Fixing merge with devel branch.
Merge pull request #86 from jwj61/devel

Devel
removing local config that I screwed up
added apache-config to ignore list
Addition of features (hide, refresh, …) to Problems in Library Browser.
Merge branch 'devel' of https://github.com/mgage/webwork2-dev

Conflicts:
	conf/defaults.config
	lib/WeBWorK/URLPath.pm
reorganization of the htdocs/js folder
removing .gitignore from repository.
Trying to get Setmaker.pm working again after merge.
Continued organization  of the htdocs/js directory
Fixed the path for the js paths in Classlist Manager
Finished the reorganization of the htdocs/js folder.
Reorganized the Homework Manager to make it simpler to use.
A few UI polishes as well.
Fixed an error with the breadcrumbs on the page top.
Merge branch 'master' of https://github.com/pstaabp/webwork2-dev

Conflicts:
	VERSION
updating defaults.config to include the homework manager page.
working interval option
Updated code to multiple templates for each answer type.
Continued work on the SimplePGeditor
Merge branch 'develop' of https://github.com/buromano/webwork2 into develop