bordel1
Merge branch 'master' into bordel1

Conflicts:
	PakCreator/Properties/Settings.cs