Fixing wrong date format
Merge branch 'develop'