мигр
Merge remote-tracking branch 'origin/qqqqq' into 3

Conflicts:
	app/database/seeds/DatabaseSeeder.php