merge from nico
1st merge from jibux
add testclass.js
remove TestJB
merge from master