Fixed the error in the Facebook, twitter authentication
Fixes to the project file
merge conflicts