Merge pull request #1230 from sumobi/master

Remove $download_id from edd_show_has_purchased_item_message()
Add cbt variable for PayPal
Fixed problem with payment history showing incorrecet names
Pass gateway from  to edd_purchase_data_before_gateway
make 'preapproved' payments get same access rights as 'complete' payments

This small tweak seems to address what I brought up in [issue #1232 for EDD](https://github.com/easydigitaldownloads/Easy-Digital-Downloads/issues/1232)
Correction misspelling
Add missing %s
[i18n]> french and pot ready for 1.6.1
Merge pull request #1236 from fxbenard/master

[i18n]> french and pot updates + misspelling correction for 1.6.1.
[i18n]> update translations files after commit #1236
Merge pull request #1238 from fxbenard/master

[i18n]> update translations files after commit #1236
Fix duplicate action hook name
Fixed conflicts
Merge branch 'master' of github.com:easydigitaldownloads/Easy-Digital-Downloads
remove 'preapproved' getting same access rights as 'complete' payments
use media_buttons action instead of media_buttons_context filter for "Insert Download" button
Fix undefined inde
Merge branch 'master' of github.com:momnt/Easy-Digital-Downloads into momnt-master
Fix relative path for X-Accel-Redirect. Closes #1245
Restore headers for #1245