finish activeadmin will_paginate error
Merge branch 'hotfix/assets'