Kaminari and will_paginate collision
Merge pull request #9 from route/master

Kaminari and will_paginate collision