Add validate token
Merge branch 'master' into ui-revolution