minor devise changes
added graviator, ot working properly
some more changes
small changes
removed adds
fixed hotel problem
added twitter
 foursquare freinds does not work
remove conflicsts
merged homepage