Add Player Movment

Added animation player movment
Some other changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/MapShow.cs
	Assets/main.unity