Merge branch 'master' of github.com:hainatravel/information-system into master

# Conflicts:
#	application/views/mobile_first/ah-lantern-form-2025.php

application/views/mobile_first/ah-lantern-form-2025.php

@@ -54,9 +54,15 @@
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
         </div>
+<<<<<<< HEAD
         <p style="font-size: 22px;margin-bottom: 5px;"><strong>Exclusive Add-on:</strong></p>
 
         <p style="margin-bottom: 5px;">Thai Costume with Makeup & Hairstyle – US$119 per person</p>
+=======
+        <p style="font-size: 22px;"><strong>Exclusive Add-on:</strong></p>
+
+        <p>Thai Costume with Makeup & Hairstyle – US$119 per person</p>
+>>>>>>> 566b85b362494b7003b58b1035538d1b84908afc
 
         <div class="numberBtn">
             <input class="minaddBtn reduceadult" id='minusButton_makeup' type="button" value="-">
@@ -70,7 +76,11 @@
             <input class="minaddBtn addadult" id='plusButton_makeup' type="button" value="+">
         </div>
 
+<<<<<<< HEAD
         <p style="font-size: 22px;margin-bottom: 5px; margin-top: 10px;"><strong>Select Ticket Quantity</strong></p>
+=======
+        <p style="font-size: 22px;"><strong>Select Ticket Quantity</strong></p>
+>>>>>>> 566b85b362494b7003b58b1035538d1b84908afc
 
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">