fixed the sticky issue in category
Merge remote-tracking branch 'origin/dev' into dev