Complete context menu according to spec
Merge pull request #80 from geoadmin/dev_contextmenu2

Complete context menu according to spec