changed ajax to objects
fixed conflicts
fixed logout issue
Merge branch 'fb_oauth' of https://github.com/fiery-skippers-2014/Festifind into fb_oauth
got oauth logout button
uncommented twitter