gf
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Cutscenes/Cutscene_1.xml
	Spelprojekt/Resources/Data/Settings.xml
cutyu
ggf
Merge branch 'Jessica'
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/SoundManager.h
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
dfsaf
Merge branch 'master' into bella
iyfi9
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/WorldMapTutorial.cpp
asg
Merge branch 'bella'
Merge branch 'robin'
jkbjl
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
asdasd