Fixed phase skipping, add default code to execute on skip in server phases if needed.
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

# By Jason Fleischer
# Via Jason Fleischer
* 'master' of https://github.com/jasonfleischer/KingsNThings:
  merge fixes
  battle fixes