Account activation by admin
Merge branch 'feature-user' into dev