Merge branch 'hotfix/1st-hotfix'
Merge branch 'release/3.0'
Merge pull request #3 from michaelbaudino/feature/plop

Feature/plop
Merge branch 'release/sync-branches-for-lucas'
Merge branch 'hotfix/sync-branches-for-lucas-2' into develop