fda
feroz är kass
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
uohu
Merge branch 'Jessica'
best merge ever

Conflicts:
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
	Spelprojekt/Resources/Data/Settings.xml