Facebook login implemented
Resolved conflict in views