Merge branch 'hotfix/capifony' into develop
Merge branch 'hotfix/v1.0.1' into develop
Merge branch 'master' into develop
Update config