Merge remote-tracking branch 'upstream/develop' into brand_category_api
Merge remote-tracking branch 'gsegura/develop' into brand_category_api

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/service/MongoStorage.scala
Merge remote-tracking branch 'upstream/develop' into brand_category_api
First iteration of category taxonomy code
Second iteration of category taxonomy code using Solr + Mongo. Added endpoint to get categories for a brand
Added brand categories endpoint, multiple bug fixes and upgraded brand controller to use mongo as storage
Merge remote-tracking branch 'upstream/develop' into brand_category_api
Merge remote-tracking branch 'gsegura/develop' into brand_category_api

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/common/FacetQuery.scala
	opencommercesearch-api/app/org/opencommercesearch/api/controllers/CategoryController.scala
	opencommercesearch-api/app/org/opencommercesearch/api/models/Category.scala
	opencommercesearch-api/app/org/opencommercesearch/api/models/Product.scala
	opencommercesearch-api/app/org/opencommercesearch/api/models/Sku.scala
	opencommercesearch-api/app/org/opencommercesearch/api/service/MongoStorage.scala
	opencommercesearch-solr/src/test/java/org/opencommercesearch/FacetHandlerTest.java
Removed facetLimit param on category brands endpoint, will replace with a trait
Some minor identation fix
Adding color field to the api
Merge pull request #90 from naveenhooda2000/develop

Adding color field
Added category taxonomy to get product by ID endpoint.
Merge remote-tracking branch 'upstream/develop' into brand_category_api

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/models/Sku.scala
Merge pull request #88 from lujameva/brand_category_api

Brand and Category API changes + Facet updates
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/controllers/ProductController.scala
	opencommercesearch-api/conf/routes
	opencommercesearch-api/test/org/opencommercesearch/api/controllers/CategoryControllerSpec.scala