security config
Merge branch 'master' into mejty
bla bla