pull modification
resolve conflicts
pull modification
Merge branch 'expo_light' of https://github.com/ExpoTeam/expo into expo_light
slide visualization
errors display
resolve conflicts
resolve conflicts
Merge branch 'expo_light' of https://github.com/ExpoTeam/expo into expo_light

Conflicts:
	src/client/views/slideshows/slideshowEdit.js
Merge branch 'expo_light' of https://github.com/ExpoTeam/expo into expo_light