inte list_offers
inte list_offers
Merge branch 'master' of https://github.com/ggueno/projecteel

Conflicts:
	core/models.pyc
	core/views.py
	db.sql
	projecteel/settings.pyc
	templates/offers/offer.html
	templates/offers/offers.html