Updates

Main-branch and beta changes that affect cards, encounters and strategy.