proper sorting in events/history
Merge branch 'master' of https://github.com/BrainTrainSite/BrainTrain.git
Merge branch 'master' of https://github.com/BrainTrainSite/BrainTrain.git