US14536 Category API Endpoint improvements
fixed broken unit test
Merge remote-tracking branch 'upstream/develop' into develop-new
Fixed NPE MongoStorageFactory
Ignore BigDecimal in API schema
Filter skus by country
Merge branch 'develop' of github.com:gsegura/opencommercesearch into develop
add API support to persist brands and categories in mongo
integrate category api endpoint to use mongodb
Hydrate search results from mongo storage
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/service/MongoStorage.scala
apply code review changes
Added facet handling. Still pending:
* facet ordering
* facet blacklisting
* multi-select tagging for filter queries
Merge branch 'develop' of github.com:rmerizalde/opencommercesearch into develop
add trait to easily add facets to the solr query in the api controllers
Merge branch 'develop' of github.com:gsegura/opencommercesearch into develop

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/service/MongoStorage.scala
Updated jackson-module to 2.1.5 to prevent build failures
Merge pull request #83 from lujameva/develop_upstream

Updated jackson-module to 2.1.5 to prevent build failures
Merge remote-tracking branch 'upstream/develop' into develop
update jongo to 1.0 and jackson to 2.2.3
annotate api model objects with @JsonProperty to avoid some runtime exceptions
changed country model obj bigdecimal properties to double to avoid some runtime errors when retrieving products from mongo
fix test error for ocs-solr
add logic to category feed to avoid sending categories that don't have a valid seoUrlToke property
Merge branch 'develop' of https://github.com/naveenhooda2004/opencommercesearch into develop

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/controllers/ProductController.scala
	opencommercesearch-api/app/org/opencommercesearch/api/models/Sku.scala
Merge remote-tracking branch 'gsegura-upstream/develop' into develop

Conflicts:
	opencommercesearch-api/app/org/opencommercesearch/api/controllers/ProductController.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