add facebook views
merge vaishakhi's changes
re-include facebookcontroller