updating the layout to new design
update the layout, finish the ferry page, added images
minor layout changes deleted calendar view
pull in latest dev branch update
fix the error from the merge of mobilelayout with dev
resolve git conflict and css conflict with the merge of mobilelayout and mobilelayout_tour
Merge branch 'mobilelayout' into mobilelayout_tours