Social login wip
Latest fixes
Fixing the cookie overflow (WHEN DEPLOYING NEEDS A DATABASE MIGRATION)
Email screen and overall fixes
Small fix
email icon
Added fields to Payment
Merge branch 'master' into pablos-changes

Conflicts:
	app/models/user.rb
	app/views/timeline/index.html.erb
	config/routes.rb
	db/schema.rb
update schema.rb after migration
make venue's voucher counters default to 0
fix post-merge issues
Merge pull request #18 from FoodCircles/pablos-changes

Pablos changes