Added company to user profile
Merge branch 'auction_fixes'

Conflicts:
	db/schema.rb
Updated version
Added mailchimp api key.
Merge branch 'master' of https://github.com/puneetgupta/spreeapp

Conflicts:
	Gemfile
	app/views/spree/users/profile.html.erb