change on loggs
Merge branch 'master' of https://github.com/sudhirksingh/promostree

Conflicts:
	domain/.classpath
	domain/.project
	search-service/.classpath