NFL, players approve deal to end lockout