fix admin
add unique email
Merge branch 'master' of github.com:sophilabs/djangoboot
social auth: associate by email
Merge remote-tracking branch 'origin/master'