coe
user account activation
Merge branch 'master' into rimal