Merge remote-tracking branch 'remotes/origin/spring-data-elastic-search'

Conflicts:
	build.gradle
	src/main/java/se/termweb/spring/services/impl/SearchServiceImpl.java
	src/main/java/se/termweb/spring/util/TestDataInitializer.java