update edit category
Merge origin/master