Camel case ThreatType model
Merge branch 'master' of https://github.com/pouete/jstotal