Change offer list view in rails_admin
fix seeds
Fix merge conflicts
Merge with master