Merge branch 'slideshow'
[livewp] / welcome