Updated cerbere and cntractor
Merge branch 'master' of github.com:pimvullers/elementary