Merge branch 'user_activation'