adoption commit
Merge branch 'master' of https://github.com/photon-infotech/service

Conflicts:
	.phresco/project.info
	phresco-service-impl/.phresco/project.info