FIX bugs on payement request and RGN registration
fix bugs on gift certificate and payment request
fix conflict