�save
app.js refine
app.js & initData.js
Merge branch 'master' into dev

Conflicts:
	app.js
add backup.js