Conflicts:
	common/modules/school/views/course/index.php
	common/modules/users/models/User.php
	frontend/config/main.php