merging changes from Jaime
Merge branch 'master' of https://github.com/FoodCircles/food_circles

Conflicts:
	app/models/offer.rb
	log/development.log
merging changes
merging changes
Merge branch 'master' of https://github.com/FoodCircles/food_circles

Conflicts:
	app/models/offer.rb
	config/database.yml
	log/development.log
	log/staging.log
debugging image file name not saving