[artf596256] The created pdf report cannot able to delete in the Generate report pop up.
Merge branch 'master' of https://github.com/phresco/framework

Conflicts:
	phresco-framework-web/src/main/webapp/pages/baselayout.jsp