artf737423:fixing issue on ci deploy job
Merge branch 'master' of https://github.com/photon-infotech/framework

Conflicts:
	phresco-framework-web/src/main/webapp/components/login/test/BootstrapTest.js
artf737423::Fixing issue on ci deploy job
Merge branch 'master' of https://github.com/photon-infotech/framework
Merge branch 'master' of https://github.com/photon-infotech/framework
artf737423: fixing issue on create job