Merge origin/dizains3 into tests2

pievienots datums, teksts zem prod