leroy move/damage
Merge branch 'master' of https://github.com/HeroPinball/heropinball

Conflicts:
	Hero_Pinball/Assembly-CSharp-vs.csproj
	Hero_Pinball/Assembly-CSharp.csproj
	Hero_Pinball/Assets/Test1.unity
	Hero_Pinball/Hero_Pinball-csharp.sln
	Hero_Pinball/Hero_Pinball.sln
	Hero_Pinball/ProjectSettings/TagManager.asset