Removed session storage for Fb user. On page refresh, used service to get the FB user details if he is already logged  in
Manual merge conflicts resolution