added most feature in combat activity
add close ranged fight engagement functionality
end fight and remove hero
forgot so;ething
Merge branch 'model'
merge