Registered app and created user-friendly facebook login prompt
fixed merge conflict