Merge branch 'master' into facets-and-filters

Conflicts:
	models/src/it/java/io/sphere/sdk/products/ProductProjectionSearchIntegrationTest.java
	models/src/main/java/io/sphere/sdk/products/queries/ProductCatalogDataQueryModel.java
	models/src/main/java/io/sphere/sdk/products/queries/ProductDataQueryModelBase.java
	models/src/main/java/io/sphere/sdk/products/search/ProductProjectionSearch.java