Fixing tick xAxis and overlapped text in trending report #670, #671
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