stopPropagation of edit button
Don't ever display edit form if not editable.
Merge branch 'edit_button_fixes'

* edit_button_fixes:
  Don't ever display edit form if not editable.
  stopPropagation of edit button