Merge branch 'release/2.1.1' into develop
Changes I never committed
switch the rows on the homepage
Bump version
Merge branch 'release/2.2.0'