Merge pull request #22 from pstaabp/master

More updates
Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev