event test
Merge branch 'master' into nomodul
update Test and Entity but not finished because buon ngu