slideshow : update function
Merge branch 'master' of https://github.com/ExpoTeam/expo
slideshow : update function
Merge branch 'master' of https://github.com/ExpoTeam/expo
slideshow : update function
slideshow : update function
Merge branch 'master' of https://github.com/ExpoTeam/expo
slideshow : update function
Merge remote-tracking branch 'origin/master'

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