Bugfix: apps have redirect URIs, not tokens.
Merge branch 'master' into i18n