Better facebook log in
merge