Merge remote-tracking branch 'origin/Sprint5' into Klim
add logo
Merge remote-tracking branch 'origin/Klim' into Sprint5