More text
Merge branch 'touch_carousel'