Changed drag-and-drop setup to turn on and off with editing so that popups will work when not editing
Merge branch 'popups_in_ie_ge_10' into develop