Merge and repair conflicts.
Merge branch 'master' of https://github.com/nofilenamed/BanishedGermanTranslation

Conflicts:
	Dialog/StringTable.rsc