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) {

resources/assets/js/password-strength.js

@@ -0,0 +1,80 @@
+/**
+ * Combine jQuery and zxcvbn to create a password strength meter.
+ * Based on : strengthify https://github.com/kabum/strengthify
+ */
+(function($) {
+    $.fn.strengthify = function(paramOptions) {
+        var me = this,
+            defaults = {
+                zxcvbn: 'https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/2.0.2/zxcvbn.min.js'
+            },
+            options = $.extend(defaults, paramOptions);
+
+        // Add elements to the DOM
+        $('.strengthify-wrapper')
+            .append('<div class="strengthify-bg" />')
+            .append('<div class="strengthify-container" />')
+            .append('<div class="strengthify-separator" style="left: 25%" />')
+            .append('<div class="strengthify-separator" style="left: 50%" />')
+            .append('<div class="strengthify-separator" style="left: 75%" />');
+
+        $.ajax({
+            cache: true,
+            dataType: 'script',
+            url: options.zxcvbn
+        }).done(function() {
+            me.bind('keyup input', function() {
+                var password = $(this).val(),
+                    // Hide strengthigy if no input is provided
+                    opacity = (password === '') ? 0 : 1,
+                    // Calculate result
+                    result = zxcvbn(password),
+                    css = '',
+                    // cache jQuery selections
+                    $container = $('.strengthify-container'),
+                    $wrapper = $('.strengthify-wrapper');
+
+                $wrapper.children().css(
+                    'opacity',
+                    opacity
+                ).css(
+                    '-ms-filter',
+                    '"progid:DXImageTransform.Microsoft.Alpha(Opacity=' + opacity * 100 + ')"'
+                );
+
+                // Style strengthify bar
+                // possible scores: 0, 1, 2, 3, 4
+                switch (result.score) {
+                    case 0:
+                    case 1:
+                        css = 'password-bad';
+                        break;
+                    case 2:
+                        css = 'password-medium';
+                        break;
+                    case 3:
+                    case 4:
+                        css = 'password-good';
+                        break;
+                }
+
+                $container
+                    .attr('class', css + ' strengthify-container')
+                    // possible scores: 0, 1, 2, 3, 4
+                    .css(
+                        'width',
+                        // if score is '0' it will be changed to '1' to
+                        // not hide strengthify if the password is extremely weak
+                        ((result.score === 0 ? 1 : result.score) * 25) + '%'
+                    );
+
+                // Reset state for empty string password
+                if (password === '') {
+                    $container.css('width', 0);
+                }
+            });
+        });
+
+        return me;
+    };
+}(jQuery));

resources/assets/sass/app.scss

@@ -43,6 +43,7 @@ body {
 @import "plugins/messenger";
 @import "plugins/animate";
 @import "plugins/bootstrap-datetimepicker/bootstrap-datetimepicker";
+@import "plugins/password-strength";
 
 // Status Page will need to override certain styles.
 @import "status-page";

resources/assets/sass/plugins/_password-strength.scss

@@ -0,0 +1,46 @@
+.strengthify-wrapper > * {
+    -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+    filter: alpha(opacity=0);
+    opacity: 0;
+    -webkit-transition:all .5s ease-in-out;
+    -moz-transition:all .5s ease-in-out;
+    transition:all .5s ease-in-out;
+}
+
+.strengthify-wrapper {
+    position: relative;
+}
+
+.strengthify-bg, .strengthify-container, .strengthify-wrapper, .strengthify-separator {
+    height: 8px;
+}
+
+.strengthify-bg, .strengthify-container {
+    display: block;
+    position: absolute;
+    width: 100%;
+}
+
+.strengthify-bg {
+    background-color: #eeeeee;
+}
+
+.strengthify-separator {
+    display: inline-block;
+    position: absolute;
+    background-color: #ffffff;
+    width: 2px;
+    z-index: 10;
+}
+
+.password-bad {
+    background-color: $cachet-red;
+}
+
+.password-medium {
+    background-color: $cachet-yellow;
+}
+
+.password-good {
+    background-color: $cachet-green;
+}