correct 'dess' to 'desweiteren'
Merge remote-tracking branch 'upstream/master'

Merge to upstream
Changed namespaces of L_German and LG_
Merge remote-tracking branch 'upstream/master'

Conflicts:
	world/map/npc/functions/barber.txt
delete scenseless lines
Merge pull request #2 from Darksider3/master

Des, Barber.txt Gültigkeits-check