corrected callback url in preprod
space based tokens and from email id changed
Merge branch 'preprod' into prod

Conflicts:
	settings.json