(1) This update comments out the line in Logout.pm that transmits
the username to Login.pm if the "Log in Again" button is pressed.
This change is needed to suppress an error message in the Login screen
that would appear if Login.pm is sent a username but no other
credentials.
(2) This update adds documentation to authen_LTI.conf.dist
that was lost when authen_LTI.conf.dist was created, probably
due to an out-of-date version of global.conf having
been used to create authen_LTI.conf.dist.
Merge pull request #25 from goehle/master

Take 2
Merge branch 'master' of https://github.com/openwebwork/webwork2-dev

Conflicts:
	conf/database.conf.dist
	conf/global.conf.dist
	conf/localOverrides.conf.dist
	conf/templates/math3/math3.css
	lib/WeBWorK/ContentGenerator/Achievements.pm
	lib/WeBWorK/ContentGenerator/ProblemSet.pm
Bring master up to date with 2.5.1.1 during this process
Merge branch 'ww2.5.1.1'

Conflicts:
	conf/database.conf.dist
	conf/localOverrides.conf.dist
	lib/WeBWorK/AchievementEvaluator.pm
	lib/WeBWorK/Authen.pm
	lib/WeBWorK/ContentGenerator/Achievements.pm

Bring master up to date with ww2.5.1.1
Add changes to OPL-update obtained from iron particle
Fix x-axis label position (hopefully)

Changed the location of text id=problem... from x=$barxpixel y=$barypixel to x=$problemlabelxpixel y=$problemlabelypixel
Merge pull request #29 from paultpearson/patch-1

Fix x-axis label position (hopefully)
Merge pull request #31 from mgage/ww2.5.1.1

Ww2.5.1.1
Be more careful about replacing _ with spaces in set names

Instead of replacing _ with a space a in $name itself we do the replacement in $display_name
The replacement is now only for the purposes of display and $name does not have spaces
which can sometimes cause problems.

this fixes a bug in which students (but only students) could not print pdf copies from the
Course homepage.
Add link to codemirror2 at htdocs from theme/math3

This is probably not the best way to include codemirror2 in every
theme but it's a start
Fix bugs and improve error messages in SendMail.pm

It's a wonder that anything worked here.  It's clear that
errors in mailing would not have been reported.

The actual bug seems to be that the value $r needs to be passed
explicitly into cleanup_register().  This was not being done. It
is not clear why this used to work.

The error checking routine has been beefed up and to some extent
unit tested.  The unit tests can be repeated by uncommenting
the warn messages.
Comment out codemirror in themes math2 and math3

These two themes are not yet ready to play with codemirror.
The theme ubc does seem to play well with codemirror.
Merge pull request #32 from mgage/ww2.5.1.1

Ww2.5.1.1
Merge pull request #34 from mgage/master

syncing master branchs of openwebwork/webwork2-dev and mgage/webwork2-dev
Add a VERSION file for PG.

In order to reach it cleanly there needs to be a link PG_VERSION in webwork2/ to the file pg/VERSION.
Merge pull request #35 from mgage/ww2.5.1.1

Add a VERSION file for PG.
Merge pull request #36 from mgage/master

Add a VERSION file for PG.
Merge pull request #15 from openwebwork/ww2.5.1.1

Ww2.5.1.1
Merge branch 'master' of https://github.com/openwebwork/webwork2

Conflicts:
	conf/localOverrides.conf.dist
Replace include() by require().

Include() is not defined in this context.