Commit fedb5b3aea47b1eb302982f7c9488caf003492a2

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