merge
commit
Merge branch 'HieuNN'
truncate string
edit painting
fix users admin
fix conflict