bug dogovor (create date)
Merge remote-tracking branch 'origin/staging'