update login fb g+
Merge origin/master