Issue 9 1

Merge facebook and twitter login in master.