Merge branch 'dev'
Merge branch 'master' into beta
Merge branch 'beta'
chang dev2.json on dev
change dev1.json on dev
change dev2.json on dev
Merge branch 'master' into beta