sagaq
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml