8090
Merge branch 'master' of https://github.com/xidui/first

Conflicts:
	a/common.js