q!
add configuration for cdp staging
Merge branch 'master' of https://github.com/yoodoc/cdpIndexer

Conflicts:
	src/main/resources/elasticsearch.properties
	src/main/resources/kafka.properties