cleanup/e-mail bugfix
fixed registration issue
Merge branch 'login' of github.com:kaninepete/NewFacebook into login