Fixed: Date time bug in diff language.
Merge branch 'develop'
Fixed developer id
Merge branch 'hotfix/developer-id'