Merge remote-tracking branch 'origin' into thomas
Merge branch 'master' into thomas
preliminary design on tour ui
Merge branch 'master' into thomas