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
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
add support for category facet in the api
add support for handling filter queries and multi select facets

pending issue when special characters appear in the filter query
enable filter queries support for search & browse endpoints in the Product API
Return facets based in the order business defined
Fix issues with categoryPath encoding
Add category facet to the results
Merge remote-tracking branch 'upstream/develop' into develop
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