Remove credit card link and replace with only one input for creditcard and paypal
Merge branch 'aug_7_2014'