merge adapter
merge adapter
merge adapter
Merge branch 'master' of https://github.com/hqt/HopAmChuan
modify main Activity
Merge branch 'master' of https://github.com/hqt/HopAmChuan