rm .DS_Store
fix bug of clicking pagination
Merge branch 'develop'