Slideshow changed
Merge origin/master

Conflicts:
	lib/expo.js