well that was easy
removed public/uploads
fixed one merge conflict
Merge pull request #15 from jacindaz/pagination

well that was easy