Merge.
Merge branch 'qa' of https://github.com/denimgroup/threadfix into qa
Refactoring UserEnt/TeamEnt.