Commit 97711ef1af06c8ce4596348eb8fb35fd7bb4b9d1

Merge branch 'master' of pantoto.org:sweet-web/mural-annotation