Only one token per user
Merge branch 'master' into android