Adding headquarters information to products table
Adding headquarters information to products table
Merge branch 'master' into development

Conflicts:
	db/schema.rb