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