Merge branch 'GGMAC' into 'master'

update kuy

See merge request !1491

src/container/ResetPassword.js

@@ -57,7 +57,7 @@ class ResetPassword extends Component {
 
   isRegex(value) {
     // const re = /^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/;
-    const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{1,}$/;
+    const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#_?&]{1,}$/;
     return re.test(String(value));
     // return value
   }