fix assets links
Merge branch 'dev'