Redirect to the previous page after editing
Merge branch 'develop'