Fixed edges of map for other actors and during battles
Merge branch 'master' of https://github.com/knarr/winter