Release 2 updates
Merge branch 'development'

Conflicts:
	db/schema.rb
Merge branch 'development'

Conflicts:
	db/schema.rb
Merge branch 'development'
Adding headquarters information to products table