Added avatar upload action
Fixed merge conflict
Merge branch 'master' of https://github.com/hlboy4ik/test