Merge pull request #123 from dannybutler/master

Fixing datatables pagination