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

resources/assets/js/app.js

@@ -360,6 +360,9 @@ $(function() {
             .filter(":lt(" + (next) + ")")
             .addClass("active");
     }
+
+    // Password strength
+    $('.password-strength').strengthify();
 });
 
 function askConfirmation(callback) {