Merge remote-tracking branch 'origin/dev-nd'
Merge branch 'dev-ma'
Merge branch 'master' of https://github.com/mikhail-aksenov/barnyard