change dev1.json
Merge branch 'dev'