Context menu
Merge branch 'master' of github.com:CreativeMobile/socmap-dfl
Merge
Merge