Fixed bug deleting annotation, replaced button with label in control bar
Merge branch 'master' of github.com:kcl-ddh/digipal