Table sorting and pagination
Merge branch 'enhancement-#9' into develop