updatelayout
Merge branch 'master' of https://github.com/trong291990/bravo