OKEJSISTA
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml