kolejny problem z deliverka
Merge remote-tracking branch 'origin/kickoff'
exception handlig fix for editing
Merge remote-tracking branch 'origin/master' into kickoff