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

Conflicts:
	src/client/views/slideshows/slideshowEditNavbar.html