edit text
Merge branch 'dev'