Merge branch 'master_hotfix' into dev

# Conflicts:
#	service/src/main/java/com/yoho/search/aggregations/impls/BrandAggregation.java

@@ -33,6 +33,7 @@ public class BrandAggregation extends AbstractAggregation{
 	
 	@Override
 	public AbstractAggregationBuilder getBuilder() {
+		//return AggregationBuilders.terms(aggName()).field("brandId").size(1000);
 		return AggregationBuilders.terms(aggName()).field("brandId").size(200);
 	}