merge dev to master use no-ff
merge dev to master use no-ff 2
Merge branch 'dev'
Merge branch 'dev'
mod line 4, 5, 6