dev44

dev4
Merge branch 'master' into dev

Conflicts:
	index.html
Merge branch 'master' into dev

Conflicts:
	index.html
Reset
其他人修改dev
dev的修改
rebase practice
merge's merge
dev 1
merge 2