velocity setup fixed
pagination fixed and disabled everywhere
Merge branch 'master' into dev