Capifony setup
Merge branch 'master' into DEPLOY_capifony