update user activation
Merge branch 'master' into project