Merge remote-tracking branch 'origin/jay' into jay
04/17/2013 paypal and other enhancements