Added logic to encode parameters in callbackURLs. Caused problems with postbacks.
Merge remote-tracking branch 'origin/bug-fixes' into bug-fixes