Merge branch 'dev' into thy
Merge branch 'dev' into thy
add a js file,see if the buttons work alright
Merge branch 'thy' into dev