added omniauth facebook
merge