Merge branch 'hotfix-0.9.6'
add stats page
Merge branch 'hotfix-0.9.7' into develop