Merge branch 'master' into develop

.styleci.yml

@@ -6,4 +6,8 @@ php:
     not-name:
       - index.php
       - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
 css: true

database/factories/UserFactory.php

@@ -1,7 +1,6 @@
 <?php
 
-/* @var $factory \Illuminate\Database\Eloquent\Factory */
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
-
 use App\User;
 use Illuminate\Support\Str;
 use Faker\Generator as Faker;