Merge branch 'hotfix/register_duplicate_emails'
Merge branch 'master' of github.com:iDevSchulz/scaling-tyrion