Merge pull request #30 from colincoghill/master

Restore assessment editing page
Merge pull request #40 from colincoghill/release/3.9.2

Merge pull request #30 from colincoghill/master