Re-merging "Merge pull request #93 from jparadis/add-stoppropagation-ui-menu"

This reverts commit edf88737bd2b386461880a77f6fadbc98e8235f0.
Merging origin/bob/master-pending/pr93-stopClickPropagation into master