Fixed wrong asset paths
Merge remote-tracking branch 'origin/asset_path_fix' into asset_path_fix