Performance popup check box issue fixed
When refreshing the page with URL http://localhost:2468/framework/logout.action, throws Null pointer exception handled
Merge branch 'master' of https://github.com/phresco/framework

Conflicts:
	phresco-framework-impl/src/main/resources/contextUrls.st
	phresco-framework-impl/src/main/resources/dbContextUrls.st
Performance popup check box issue fixed
Merge branch 'master' of https://github.com/phresco/framework