update entity
Merge branch '2.1.0' of git://github.com/vinhtrinh/framework into 2.1.0
merged with vinh
add some tests
Merged with Vu Nguyen & Tuan Nguyen