change dev2.json on master
Merge branch 'master' into dev