FUN-21:Page edit category.
Merge branch 'master' of github.com:Lexy92/Funeral