$payment_data now has default value

The $payment_data parameter of the edd_apply_email_template function is
only used for backwards compatibility. The parameter now has a default
value so it's not required to be used when using the function.
Merge pull request #1353 from barrykooij/master

$payment_data now has a default value
My thoughts on fixing #1356
Added missing "B"
Merge pull request #1357 from ghost1227/bugs/1356

My thoughts on fixing #1356
Fix merge conflict
Compress scriptsand styles
Merge branch 'release/1.7' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/1.7