hp and mp regen
Merge pull request #520 from sadbear-/regen

hp and mp regen, closes #427