Выкручен rights
Merge origin/master
Merge origin/master
Merge branch 'master' into tags_new

Conflicts:
	.gitignore
Merge branch 'master' into tags_new

Conflicts:
	.gitignore