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

# Conflicts:
#	application/third_party/order/views/ah/confirm_order.php
#	application/third_party/order/views/gh/confirm_order.php

application/third_party/order/views/confirm_order.php

@@ -458,7 +458,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
                             <option value="Argentina +54">Argentina</option>
                             <option value="Armenia +374">Armenia</option>
                             <option value="Aruba +297">Aruba297</option>
-                            <option value="Ascension Island +247">Ascension Island2</option>
+                            <option value="Ascension Island +247">Ascension Island</option>
                             <option value="Austria +43">Austria</option>
                             <option value="Azerbaijan +994">Azerbaijan</option>
                             <option value="Bahamas +1">Bahamas</option>
@@ -524,7 +524,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
                             <option value="Finland +358">Finland</option>
                             <option value="France +33">France</option>
                             <option value="French Guiana +594">French Guiana</option>
-                            <option value="French Polynesia +689">French Polynesia6</option>
+                            <option value="French Polynesia +689">French Polynesia</option>
                             <option value="Gabon +241">Gabon</option>
                             <option value="Gambia +220">Gambia</option>
                             <option value="Georgia +995">Georgia</option>