Merge branch 'master' of https://github.com/GerardSchornagel/DST

Conflicts:
	DataTypes/Player/character.vb
	DataTypes/Player/inventory.vb
	DataTypes/Player/player.vb
	DataTypes/Player/statistics.vb