edit text on the fly
Merge branch 'dev' of https://github.com/hungnq1989/binhluananh into dev