facebook login fix
Merge remote-tracking branch 'origin/Wikinode' into Wikinode