ddd
Merge branch 'hid4enly' into dev
validate js
merge
merge
merge hid