Fixed a problem with Messages in the answer output
Merge branch 'develop' of http://github.com/openwebwork/webwork2 into devupdates
Shuffle locations of .js files to try to make SetMaker3 work again
Merge branch 'develop' of http://github.com/openwebwork/webwork2 into devupdates
Merge branch 'develop' of https://github.com/GravelInnovation/webwork2 into devupdates
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop
Merge pull request #128 from jwj61/develop

OPL-update update
French translation 3
Merge remote-tracking branch 'upstream/develop' into develop
Update math4.css

Addressed bug 2647
Fixed broken disabled buttons
Conditional release initial commit. Allows instructor to specify that a set will not become visible until a sufficiently high score is obtained on another set.
Updates to conditional release. Removed relax_restricted_release. Added feature to warn and ignore nonexistent set names in the restricted release list. Now gives message about restricted release instead of toggling visibility.
Cleanup from rebase
Some conditonal release fixes and tweaks.
Merge branch 'develop' of https://github.com/GravelInnovation/webwork2 into devupdates
Merge pull request #129 from GravelInnovation/develop

French translation part 3
Merge branch 'develop' of http://github.com/openwebwork/webwork2 into devupdates
Made the hr black for problems.  This is so that its easier to use with fractions.
Made the navigation bar hidden when viewed in the pgeditor3 modal.