Changed the statistics page to load via an ajax query to avoid a 504 timeout error
Merge branch 'development' into production