Merging changes from master to dev, to fix compiler issues related to FlxSpriteGroup changes.