merge 3 dev to dev-main

add image ,js,themes folder