Merge pull request #140 from Bertram25/development

Added support to cross-fade some battle music when encountering enemies.