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

Conflicts:
	phresco-framework-web/src/main/webapp/js/commonComponents/modules/header/js/listener/headerListener.js
Merge branch 'master' of https://github.com/photon-infotech/framework

Conflicts:
	phresco-framework-web/src/main/webapp/components/projectlist/js/listener/projectListListener.js
	phresco-framework-web/src/main/webapp/js/commonComponents/modules/header/js/listener/headerListener.js
Source revert