Began Facebook OAuth
merging plan page
Got ui looking good on plan view.  Calendar and Map working
merged branches with Jonah