Ensure uniqueness of annotation id (issue #13)
Merge branch 'master' of https://github.com/corot/world_canvas.git