Fix duplicate action hook name
Fixed conflicts
Merge branch 'master' of github.com:easydigitaldownloads/Easy-Digital-Downloads