test7
Merge branch 'master' of https://github.com/shrujal/CQ-Repo.git

Conflicts:
	spcqProject/bundle/pom.xml