Added control over fx-hack to environment variable and JVM property
Fixed computation of page count in object 'pagination'
Merge branch 'master' into Police