added new role canManageGrcTools to Permissions
Add support for Cppcheck.
Cppcheck importer
adding conditions for grc tools to config display
moving files for enterprise access
update pointer in graphs
Compliance report
Add new mappings for cppcheck
Add support for Cppcheck.
rearranging order of items in config cog
Fixing tick xAxis and overlapped text in trending report #670, #671
Merge branch '2.2' into 2.2i3

Conflicts:
	threadfix-main/src/main/resources/import.sql
	threadfix-main/src/main/webapp/WEB-INF/web.xml
Merge branch 'sbir-phase2' into 2.2i3

Conflicts:
	threadfix-main/src/main/resources/import.sql
	threadfix-main/src/main/webapp/WEB-INF/web.xml
Merge branch '2.2i3' of https://github.com/denimgroup/threadfix into 2.2i3
Adds missing DefaultConfiguration value that was failing a bunch of unit tests.
Adds session timeout to defaultconfiguration in import.sql.
Updates the correct threadfix.script file to fix the unit tests.
Merge pull request #686 from denimgroup/cppcheck-importer

Cppcheck importer
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