fix package.json
fix package.json
..
..
change package.json
change package.json
test for bae 3
Merge branch 'master' of https://git.duapp.com/appide17ei0wdu0 into dev

Conflicts:
	package.json
test for bae 3
change package.json
..
..
..
test
test
test
test
test
test
tset