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