Merge branch 'release/1.1.4' into dev
lock nav font-size
bump version
Merge branch 'release/1.1.5'