Merge branch 'hotfix/2.2.1'
Added 60px min-height to .navbar
Merge branch 'hotfix/2.2.2' into develop