version 0.9
Merge branch 'master' of https://github.com/studio-ahoi/ahoi_assets

Conflicts:
	config.inc.php