Merge branch 'release/1.1.17' into dev
add css vendors and fix side nav
bump version
Merge branch 'release/1.1.18'