finish assets
Merge branch 'hotfix/assets'