Adding facbook login
Fix conflict, deleting require_tree line
Fix a bug on twitter login after FB login added