Added kaminari for disecting entries to different pages.
Merge conflicts.