preliminary hitbox, also charprop stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity