use the right method calls for kaminari
Merge branch 'master' into pageinfo_fix
Merge pull request #83 from extension/pageinfo_fix

Pageinfo fix