update entity + model + add Dependency Injection
fix some stupid bugs
Merge pull request #1 from anhtuannguyentran/master

update entity + model + add Dependency Injection