Fix: .makeAnnotatable now effective immediately rather than lazy loading
Minor CSS fix
Canvas opacity fade now controlled via CSS
Refactoring
Fixed 'Evil Joachim' exploit
Merge branch 'master' into gui-redesign
Consolidating changes