really fix email caps and registration system this time
Merge branch 'master' into staging