closes #115
Merge branch 'iss115' into iss96-v2
Pagination and filtering works
Additional tests
Ajax pagination works - closes #96

:metal: