fix landing page with facebook and google.
Merge remote-tracking branch 'origin/develop' into develop