Merge branch 'hotfix/1.0.10'
-rwxr-xr-x 3233 AC_RunActiveContent.js
-rw-r--r-- 991 BADfriend.php
-rw-r--r-- 345 GLM_site_check.phtml
drwxr-xr-x - admin
drwxr-xr-x - assets
-rwxr-xr-x 212 bottom.inc
drwxr-xr-x - build
-rwxr-xr-x 1505 butterfly-conservatory.php
-rwxr-xr-x 1462 carriage-tours.php
drwxr-xr-x - classes
-rw-r--r-- 914 contact-us.php
-rwxr-xr-x 1983 contactform.css
-rw-r--r-- 6719 faq.php
-rwxr-xr-x 1911 ferry-lines.php
-rwxr-xr-x 1911 ferry-lines2.php
-rwxr-xr-x 222258 flash.swf
drwxr-xr-x - fonts
-rwxr-xr-x 1406 fort-mackinac.php
-rw-r--r-- 0 gallery.jpg
-rw-r--r-- 656 googleMap.php
-rwxr-xr-x 1608 grand-hotel.php
-rw-r--r-- 867 homesave.html
drwxr-xr-x - images
drwxr-xr-x - includes
-rwxr-xr-x 4057 index.php
drwxr-xr-x - lib
drwxr-xr-x - libjs
-rw-r--r-- 1546 links.php
drwxr-xr-x - member
-rwxr-xr-x 2256 nav.inc
-rwxr-xr-x 349 offsite-links.js
-rwxr-xr-x 9345 order-form.inc.php
-rwxr-xr-x 6730 order-form.php
-rw-r--r-- 910 print.css
-rwxr-xr-x 3653 promote.php
-rwxr-xr-x 3343 purchase.php
-rwxr-xr-x 3344 purchase.php.save
-rwxr-xr-x 4974 sample-itinerary.php
-rwxr-xr-x 60033 setup.phtml
-rw-r--r-- 1201 sign-up.php
-rwxr-xr-x 4087 styles.css
-rwxr-xr-x 86781 temp-home.gif
-rwxr-xr-x 963 template.php
drwxr-xr-x - templates