add dev 3.log
Merge branch 'dev'
merge 3.log