fix conflict
Merge branch 'master' of https://github.com/hqt/HopAmChuan
design inf listview
Merge branch 'master' of https://github.com/hqt/HopAmChuan