Merge branch 'hotfix/2.1.1'
Added teamplacements
Added IMC logo
Merge branch 'hotfix/2.1.2' into develop