Merge branch 'develop'
Fix date format of some documents