sorting date times properly
Merge branch 'staging'