Merge remote-tracking branch 'origin/master'

Conflicts:
	roadmap.rus.md
Merge branch 'master' of https://github.com/Limych/genibase.git