Merge pull request #80 from baasbox/opti

update from origin opti
changed name of security class
Merge pull request #81 from giastfader/reactive

changed name of security class
Merge pull request #580 from giastfader/opti

changed name of the security class