1.Add debug info for access token timeout issue
2.Generate the subscription call back url based on server name
3.Code tidy up
Merge commit '4c379e5e7e351a13de009ef3412b1c48f5219434'

# By Tzur Sayag
# Via Tzur Sayag
* commit '4c379e5e7e351a13de009ef3412b1c48f5219434':
  some text changes. Code in this file is junk, must be refactored now.