Added fb login and check user
merge conflicts