Committing to fix pick up bugs.
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Moved animationData setting from Mom to work with all NPCS.
Committing to merge with head.
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	Assets/Data/DispositionData/DispositionData.xml.meta
	Assets/Scenes/MainLevel/LevelYoung.unity
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Changed NPC prefab to be our new prefab for the game.  Also MEGA sister is no more.