Slideshow fix height inline
Merge branch 'master' of https://github.com/carlbanan/Creandum-theme

Conflicts:
	library/js/scripts.js