Fix paypal payment
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into 4761_paypal
Fix conflicts
Fix migrations
Merge pull request #87 from MediaSapiens/4761_paypal

4761 paypal