locations can now also handle annotations. fixes #209
Merge branch 'master' of github.com:ddsc/webclient