boss/pickup implementations
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hero_Pinball/Assembly-CSharp-vs.csproj
	Hero_Pinball/Assembly-CSharp.csproj
	Hero_Pinball/Hero_Pinball-csharp.sln
	Hero_Pinball/Hero_Pinball.sln
	Hero_Pinball/Hero_Pinball.userprefs