artifacts
Merge branch 'master' of https://github.com/ignazas/VAAS

Conflicts:
	index.php