fix match entities, update match dal
merge
Merge branch 'master' of https://github.com/anhdv282/IXJ