More animations!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Assets/Scenes/Main.unity
	Unity/Assets/Scripts/PlayerScript.cs
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/InspectorExpandedItems.asset
	Unity/Library/assetDatabase3
	Unity/Library/expandedItems
	Unity/Library/guidmapper