replaced all risky calls to "update the combat status" with (deprecated) "hate is present" phrase - bug #245
fixed a typo in "to hide" phrase
Merge branch 'bug-245'
fixed #273
Merge remote-tracking branch 'origin/master'