smart search
Merge remote-tracking branch 'origin/master'

Conflicts:
	catalog/smart-search/src/main/java/cz/web/catalog/service/search/SmartSearchService.java
	catalog/smart-search/src/main/java/cz/web/catalog/service/search/SmartSearchServiceImpl.java
	catalog/smart-search/src/main/java/cz/web/catalog/service/search/model/EntryItem.java
	catalog/smart-search/src/test/java/com/hp/ccue/search/SmartSearchServiceImplTest.java
	catalog/smart-search/src/test/resources/appTests-context.xml