same page sync
same page sync
Merge branch 'master' into kristin
Merge branch 'master' into kirk
edited space.rb and _new_space.erb
edited _description_tab.html.erb
edited _description_tab.html.erb
sanity check around spaces.rb
added space.reb def
added space.reb def
edited self.room_types under space.rb
edited self.room_types under space.rb
added a/v to amenities
added koser bit
sq ft change
changed date time stuff
made mistake
made mistake kristin pull this down
changed placeholders and headers in booking_sidebar_html.erb
kirk