Merge branch 'alexey'

Conflicts:
	laravel/app/database/seeds/PagesSeeder.php