Fix getCallBackURL replace // by / at the end of uri
Merge remote-tracking branch 'origin/develop' into local-develop