added damage resolution
Merge commit 'f42f7d013e02b24ee3a2b42290d4ca4fb88b427b'

Conflicts:
	Assets/prefabs/P_Knight.prefab