Fix callback url. Cut off .../ws-abc, /settings ... in pgtURL
Merge remote-tracking branch 'origin/develop' into develop