Added Facebook logging in functionality
Changed a few files
Merged to master
Merged to master 2