Bugfix slideshow2: getShow method now correctly returns the slideshow data as it is supposed to do instead of wrongfully printing it right away.
Fix #831
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/template-functions.php

	modified:   zp-core/zp-extensions/slideshow2.php