Merge branch 'hotfix/2.1.1' into develop
add webchat link
add stuff on ajoin
Merge branch 'release/2.1.2'