Make Export PNG in Report pages work #681
Merge branch 'sbir-phase2' into 2.2i3

Conflicts:
	threadfix-main/src/main/webapp/scripts/report-page-controller.js
Merge branch '2.2i3' into qa-sprint