add slideshowitem
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/slideshow.html
	server/publications.js
Merge branch 'master' of https://github.com/ExpoTeam/expo

Conflicts:
	client/slideshow.html
	server/publications.js