test de conflit zdav
Fix conflict in nuked.php with pull request #2 in #1
Merge branch 'test3'

Conflicts:
	nuked.php