Merge branch 'master' into develop

database/factories/UserFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
 use App\User;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
@@ -15,8 +17,6 @@ use Illuminate\Support\Str;
 |
 */
 
-/* @var \Illuminate\Database\Eloquent\Factory $factory */
-
 $factory->define(User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,