Merge branch 'master' into New_Enhancement

src/translations/en.json

@@ -157,7 +157,7 @@
   "loginErrorMessage5":"Incorrect Username or Password",
   "loginErrorMessage6":"User account not found",
 
-  "loginSuccessMessage1":"User account not found",
+  "loginSuccessMessage1":"User account link up success",
   "loginSuccessMessage2":"You are our existing user and successfully linked your existing account.<br/>From now on, you can log in through \"iAm Smart\".",
   "loginSuccessMessage3":"Continue to use e-Service",