Переписал
Merge branch 'master' of https://github.com/bsu-web/conference

Conflicts:
	registry.php