added return URL to payment controller
added configuration parameters for uipay bundle
Merge branch 'payment'