Merge branch 'block_umkstructure' into moodle_kemguki_ru

Conflicts:
	blocks/umkstructure/lang/en/block_umkstructure.php