Fix facebook login
Duplicate email
Send real mail
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/spring/services-context.xml