adding payments access
merging changes from Jaime
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	log/development.log
Merge pull request #8 from Siesna/master

Updates to pop up code and CSS
merging changes from Jaime
Merge branch 'master' of https://github.com/FoodCircles/food_circles

Conflicts:
	app/models/offer.rb
	log/development.log
adding payments to mobi namespace
adding logs and tmp
adding city totals
totaling vouchers
working on image filename saving bug
adding deal type constants
moving paperclip s3 configuration to application config
generating vouchers
manually adding image fields
schema with offer image fields
type is a reserved field name
supporting typed categories on new homepage
altering development password
merging upstream changes