fixed 404
Merge branch 'category'
merge