Team Axanar, CBS/Paramount Settle their Differences