remove unused js
fix pagination bug
Merge branch 'develop'