Update CSS and JS versions
Merge branch 'optimize-scripts-styles' into test