pull in the latest changes

and fix a few minor styling issues
Merge branch 'master' of https://github.com/INN/navis-slideshows

Conflicts:
	navis-slideshows.php