Facebook working
Merged in desktop
to merge with jose account
Meged with Jose
Merge origin/master
Fix errors