update
Merge branch 'master' of github.com:zx1986/xFramework

Conflicts:
	.gitignore