gf
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Cutscenes/Cutscene_1.xml
	Spelprojekt/Resources/Data/Settings.xml
dfsaf
Merge branch 'master' into bella
asg
Merge branch 'bella'
asdasd
Merge branch 'robin'
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml