little fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AllAmericanTrampolineShowdown/Assets/TestScenes/FPBurgerShooter.unity