added decryption possibilities
token unit test
Merge branch 'tokentest' into develop

* tokentest:
  token unit test
config changes
Merge branch 'develop'

* develop:
  config changes
  token unit test
  added decryption possibilities