Merge branch 'release/2.10' of https://github.com/openwebwork/pg into 2.10-bugfixes
Made parserPopUp actually print out its option for hardcopies.
Changed parserPopUp so it tries to print the options inline if there aren't too many of them and if they aren't too long.
Tweaked PopUP a bit
More tweaks!
Fixed bug where geogebra wouldn't load on secure pages.
url also changed
Merge pull request #188 from goehle/2.10-bugfixes

2.10 bugfixes