Merge branch 'master' of C:\dev\devdays with conflicts.
icona пока такая
icona пока такая
logo