changed order li in top nav & replaced content in nav itinerary li
Merge branch 'master' into gh-pages