Continue add facebook auth
Fix conflic and merge code