refs #1569 added modal checking in context menu for better zIndex
Merge branch 'feature/issue-1569' into develop

Conflicts:
	src/plugins/contextMenu.js
solve z-index conflict with Twitter Bootstrap modal in CSS (#1569)