updafe for stefan

updafe for stefan
Merge remote-tracking branch 'origin/master'

Conflicts:
	script-U1404-3net/config.cfg