Fixes non-existent variable
Re-adds order ID to PayPal return URL and removes the possibility that the payment status is reset to "unfinished"
Merge pull request #348 from nsendetzky/master

Re-adds order ID to PayPal return URL and removes possibility to reset the payment status