slideshow cleanup
Merge branch 'expo_light' of https://github.com/ExpoTeam/expo into expo_light