Fixes for the pagination feature
Merge commit 'e2f041367213491157f8720b0d70e250f439d7e5' into develop

Conflicts:
	dist/bundle.js
	scripts/grid.js