Fix contexts grid inline editing action
Fix Update Context save action
Fix Context Editing
Merge remote-tracking branch 'origin/pr/717' into develop

* origin/pr/717:
  Fix Update Context save action
  Fix contexts grid inline editing action