Merge branch 'master' of https://github.com/vicozizou/zidane
Adding security conf