Merge branch 'release/1.0'
Renamed a bunch of security stuff; added a bunch of models