version 0.6
Merge branch 'master' of https://github.com/studio-ahoi/ahoi_lightbox

Conflicts:
	config.inc.php