Merge branch 'hotfix/assets' into develop
deploy fix
css fix
Merge branch 'release/css_fix'