schema
Merge branch 'master' of github.com:Novamantic/ecommerce
Merge branch 'master' of github.com:Novamantic/ecommerce

Conflicts:
	db/schema.rb