Merged branch master and fixed conflict

After Password Strength merge this branch have 2 conflict:
- gulpfile.js
- public/build/rev-manifest.json

All conflicts solved now

gulpfile.js

@@ -25,6 +25,7 @@ elixir(function (mix) {
             'vendor/bower_components/chartjs/Chart.js',
             'vendor/bower_components/jquery-sparkline/dist/jquery.sparkline.js',
             'vendor/bower_components/sweetalert/dist/sweetalert.min.js',
+            'resources/assets/js/password-strength.js',
             'resources/assets/js/app.js',
             'resources/assets/js/**/*.js'
         ], 'public/dist/js/all.js', './')