add devise with twitter and facebook
merge