Lightbox eingebaut
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/jsk.css
	php/picture.php