asdasf
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'robin'
asd