resolve conflict
Merge branch 'master' of https://github.com/hqt/HopAmChuan
finish implement Inf ListView
finish implement Inf ListView