Merge remote-tracking branch 'origin/dev' into dev1

423d4a01 · lefull_wl · a13c7858 · f5a223bc · 423d4a01 · 423d4a01
--- a/PHP/Application/BookingWap/View/default/CustomTemplate/1527164668.html
+++ b/PHP/Application/BookingWap/View/default/CustomTemplate/1527164668.html
--- a/PHP/Application/BookingWap/View/default/CustomTemplate/1542354854.html
+++ b/PHP/Application/BookingWap/View/default/CustomTemplate/1542354854.html