Merge branch 'master' into New_Enhancement

# Conflicts:
#	src/translations/en.json

src/translations/en.json

@@ -449,7 +449,7 @@
   "payOnlineMethod":"Online",
   "payDnMethod":"Demand Note",
   "payNPGOMethod":"NPGO Collection Office",
-  "payOnlineBtn":"Online Pay",
+  "payOnlineBtn":"Pay Online",
   "fpsQrcodeTitle1":"Please scan the following QR code",
   "fpsQrcodeTitle2":"QR code is valid for 3 minutes",
   "fpsQrcodeTitle3":"Please complete the payment process within the specified time",