save tour and preview tour
Merge remote branch 'upstream/master'