local commit
Merge branch 'master' of https://github.com/lumintos/rushgame

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Animations/Jump.fbx
	Assets/Animations/Jump.fbx.meta
	Assets/Animations/Jump2nd.fbx
	Assets/Animations/Jump2nd.fbx.meta
	Assets/Animations/Jump_Parkour.fbx
	Assets/Animations/Jump_Parkour.fbx.meta
	Assets/Animations/Materials/body_color_map.mat.meta
	Assets/Animations/Materials/eyes_color_map.mat.meta
	Assets/Animations/Materials/face_color_map.mat.meta
	rushgame-csharp.sln
	rushgame.sln
	rushgame.userprefs