schema.rb -- modified our hacks to activerecord to allow dumping the schema.rb file when using mysql2 gem and ruby 1.9.
(migration required) replaced object_id with item_id everywhere for compatibility with ruby 1.9
Merge remote-tracking branch 'riseup/develop' into develop