change log date
Merge branch 'develop'