Merge branch 'master' of github.com:otvorenesudy/otvorenesudy
Merge branch 'master' into 1-0-beta