fix js
fix js 2
add PepAsset
Merge branch 'develop'