added new role canManageGrcTools to Permissions
adding conditions for grc tools to config display
moving files for enterprise access
rearranging order of items in config cog
Fixing tick xAxis and overlapped text in trending report #670, #671
Merge branch '2.2i2' into 2.2

Conflicts:
	threadfix-main/src/main/webapp/scripts/report-page-controller.js
	threadfix-main/src/main/webapp/scripts/report/d3-donut.js
	threadfix-main/src/main/webapp/scripts/report/directives/d3-dashboards.js
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
Merge with 2.2i3
Giving more time for importing from WhiteHat in remote providers tests