Merge branch 'hotfix/2.1.1' into develop
new, wider template with top horizontal menu
Merge branch 'release/2.2.0'