Did some on phone tweaks to for camera zooming
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	Assets/Art/Characters/Carpenter/CarpenterOld/CarpenterOldSprite.meta
	Assets/Scripts/Camera/CameraController.cs
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine

Conflicts:
	Assets/Scripts/Camera/CameraController.cs
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine
Remapped all missing animations