NHL lockout ends as new CBA struck