Merge branch 'release/2.0' into develop
Merge branch 'hotfix/2.0.1' into develop
updated profile pic
2.0 -> 2.1
Merge branch 'release/2.1'