Merge branch 'master' into develop

.styleci.yml

@@ -6,5 +6,4 @@ php:
     not-name:
       - index.php
       - server.php
-js: true
 css: true

webpack.mix.js

@@ -11,4 +11,5 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css');
+mix.js('resources/js/app.js', 'public/js')
+    .sass('resources/sass/app.scss', 'public/css');