Added company to user profile
Merge branch 'auction_fixes'

Conflicts:
	db/schema.rb