Partial Work on SM Updates

Added in a new condition, new action, incomplete modifications to
meleeFightState
Further work on MeleeFightState

Mostly complete, now working out bugs.  Unfortunately, the few I've
noticed so far are logic bugs.
Workable version of MeleeFightState

He charges at you, stabs you, backs away.
Merge branch 'master' into state_machine

Conflicts:
	rpg/src/com/me/rpg/World.java
	rpg/src/com/me/rpg/characters/GameCharacter.java