Add links to registration page
Add activate account endpoint
Require user to be active before logging in
Fix merge errors