DATAES-96 - Add support for aggregation in ElasticsearchTemplate
Merge branch 'master' into feature/searchTimeout

Conflicts:
	src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java