Update main.xml layout
Merge remote-tracking branch 'origin/master'
abcd tai sao khong commit dc :(