working on annotations
Merge branch 'master' of github.com:ddsc/webclient
annotations now look better in modal view
Merge branch 'master' of github.com:ddsc/webclient