Closes #311
Merge branch '2.1M2' of https://github.com/denimgroup/threadfix into 2.1M2
Merge commit 'c7fc53e181745abfb3c356cdde507e38706b2d97' into HEAD