changed the deadline to show the correct value
changed the translate file
Merge remote-tracking branch 'origin/protoBranch' into development