attempted asset fix
Merge branch 'master' into beta