Added token_translator and STACK-2 compat
Merge remote-tracking branch 'simensen/token_translator'

* simensen/token_translator:
  Added token_translator and STACK-2 compat
  Fix some namespace errors.