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

Conflicts:
	.phresco/project.info