the name
Merge branch 'master' of https://github.com/LucidAnonymity/napfServer

Conflicts:
	dayz_1.napf.pbo
	dayz_1.napf/description.ext

new commit
merge
Merge branch 'master' of https://github.com/LucidAnonymity/napfServer

Conflicts:
	dayz_1.napf.pbo
watermark