Added stathat tracking and changed server to return 48h worth of data
merge origin/master