initialize some layout activity
resolve conflict
Merge branch 'master' of https://github.com/hqt/HopAmChuan
change in schema