added direct payment method for authorize.net
fixed merge conflict in users/edit