paypal fixes and transaction create
fix merge conflict in application.html.erb
Merge pull request #107 from cdcueva/paypal

Paypal