merge site-tour into master and fix conflicts