adding code for session timeout
add autowired annotation
closes #606 by adding ability for user to change session timeout
formatting
caps session timeout at 30 min and sets min at 1 min
Merge pull request #629 from denimgroup/enhancement-tfgh606-add-session-timeout

Enhancement tfgh606 add session timeout
Merge branch 'sbir-phase2' into 2.2
add url reference to checkmarx parser when creating Finding objs
adding Id for QA testing
adding Id for QA testing
Adding Id for QA testing
Changed tab headers for Analytics page to make the new D3 reports appear
to be the default and to mark the Jasper reports as "Legacy" as we work
to phase them out.
Adding ID for D3 Report chart

Conflicts:
	threadfix-main/src/main/webapp/scripts/report/directives/d3-dashboards.js
Merge branch '2.2' of https://github.com/denimgroup/threadfix into 2.2
get dashboard directives updated
point in time chart ID for QA testing
[Closes #662] fixing donut graph position in Firefox
point in time chart ID for QA testing
tip Id
Adding Ids for QA testing
[Closes #664] displaying modal when user clicks on right graph

Conflicts:
	threadfix-main/src/main/webapp/scripts/report/directives/d3-dashboards.js