changed secret token generation method
Merge branch 'secret_token_config'