asdasd
asdasdasd
asdasd
Merge branch 'master' into robin

Conflicts:
	Spelprojekt/LevelManager.cpp
	Spelprojekt/Resources/Data/Level/Jungle_Level2.xml
	Spelprojekt/Resources/Data/Level/Jungle_Level3.xml
asdasda
asegjib
asfasv
Merge branch 'sean'