Merge pull request #59 from openwebwork/master

update freeze/thaw   to nfreeze/nthaw
Merge pull request #80 from openwebwork/master

sync ww2.5.1.1 with master
Merge pull request #81 from openwebwork/ww2.5.1.1

sync Ww2.5.1.1 and master